Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(80)

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: docs/src/git-squash-branch.txt

Issue 225433003: Add a basic tutorial for the tools in depot_tools. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/depot_tools.git@git_map
Patch Set: pylint Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « docs/src/git-new-branch.demo.1.sh ('k') | docs/src/git-squash-branch.demo.1.sh » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 git-squash-branch(1) 1 git-squash-branch(1)
2 ==================== 2 ====================
3 3
4 NAME 4 NAME
5 ---- 5 ----
6 git-squash-branch - 6 git-squash-branch -
7 include::_git-squash-branch_desc.helper.txt[] 7 include::_git-squash-branch_desc.helper.txt[]
8 8
9 SYNOPSIS 9 SYNOPSIS
10 -------- 10 --------
(...skipping 21 matching lines...) Expand all
32 OPTIONS 32 OPTIONS
33 ------- 33 -------
34 34
35 -m <message>:: 35 -m <message>::
36 --message=<message>:: 36 --message=<message>::
37 Optional message to use for the first line of the squashed commit. If omitted, 37 Optional message to use for the first line of the squashed commit. If omitted,
38 it defaults to "git squash commit.". 38 it defaults to "git squash commit.".
39 39
40 EXAMPLE 40 EXAMPLE
41 ------- 41 -------
42 demo:1[]
42 43
43 [subs="specialcharacters,quotes,attributes"]
44 ----
45 [white]**$ git map**
46 [white blue-background]##\*##{zwsp}[blue-background red]** 7dcfe47 ** [gre en]##(##{zwsp}[aqua]**frozen_changes**{zwsp}[green]##)## [yellow]##2014-03-12## \~ FREEZE.unindexed
47 * [red]**4b0c180** [yellow]##2014-03-12## \~ modfile
48 * [red]**59a7cca** [yellow]##2014-03-12## \~ a deleted file
49 * [red]**6bec695** [green]##(##{zwsp}[red]##origin/master##{zwsp}[green]# #)## [yellow]##2014-03-11## \~ Add neat feature [white]**<(frozen_changes)**
50 * [red]**d15a38a** [yellow]##2014-03-11## \~ Epic README update
51 * [red]**d559894** [green]##(##{zwsp}[lime]**master**{zwsp}[green]##)## [ yellow]##2014-03-11## \~ Important upstream change
52 [red]##|## * [red]**9c311fd** [green]##(##{zwsp}[lime]**cool_feature**{zwsp }[green]##)## [yellow]##2014-03-11## \~ Respond to CL comments
53 [red]##|## [green]##|## * [red]**2a1eeb2** [green]##(##{zwsp}[lime]**subfeatu re**{zwsp}[green]##)## [yellow]##2014-03-11## \~ integrate with CoolService
54 [red]##|## [green]##|## * [red]**d777af6** [yellow]##2014-03-11## \~ slick co mmenting action
55 [red]##|## [green]##|/##
56 [red]##|## * [red]**265803a** [yellow]##2014-03-11## \~ another improvement [white]**<(subfeature)**
57 [red]##|## * [red]**6d831ac** [green]##(##{zwsp}[fuchsia]**spleen_tag**{zws p}[green]##)## [yellow]##2014-03-11## \~ Refactor spleen
58 [red]##|## * [red]**82e74ab** [yellow]##2014-03-11## \~ Add widget
59 [red]##|/##
60 * [red]**d08c5b3** [green]##(##{zwsp}[lime]**bogus_noparent**{zwsp}[green ]##)## [yellow]##2014-03-11## \~ Wonderful beginnings [white]**<(cool_feature )**
61 [white]**$ git squash-branch "cool squash demo"**
62 [white]**$ git map**
63 [white blue-background]##*##{zwsp}[blue-background red]** 2c81508 ** [gree n]##(##{zwsp}[aqua]**frozen_changes**{zwsp}[green]##)## [yellow]##2014-03-22## \ ~ cool squash demo
64 * [red]**6bec695** [green]##(##{zwsp}[red]##origin/master##{zwsp}[green]# #)## [yellow]##2014-03-11## \~ Add neat feature [white]**<(frozen_changes)**
65 * [red]**d15a38a** [yellow]##2014-03-11## \~ Epic README update
66 * [red]**d559894** [green]##(##{zwsp}[lime]**master**{zwsp}[green]##)## [ yellow]##2014-03-11## \~ Important upstream change
67 [red]##|## * [red]**9c311fd** [green]##(##{zwsp}[lime]**cool_feature**{zwsp }[green]##)## [yellow]##2014-03-11## \~ Respond to CL comments
68 [red]##|## [green]##|## * [red]**2a1eeb2** [green]##(##{zwsp}[lime]**subfeatu re**{zwsp}[green]##)## [yellow]##2014-03-11## \~ integrate with CoolService
69 [red]##|## [green]##|## * [red]**d777af6** [yellow]##2014-03-11## \~ slick co mmenting action
70 [red]##|## [green]##|/##
71 [red]##|## * [red]**265803a** [yellow]##2014-03-11## \~ another improvement [white]**<(subfeature)**
72 [red]##|## * [red]**6d831ac** [green]##(##{zwsp}[fuchsia]**spleen_tag**{zws p}[green]##)## [yellow]##2014-03-11## \~ Refactor spleen
73 [red]##|## * [red]**82e74ab** [yellow]##2014-03-11## \~ Add widget
74 [red]##|/##
75 * [red]**d08c5b3** [green]##(##{zwsp}[lime]**bogus_noparent**{zwsp}[green ]##)## [yellow]##2014-03-11## ~ Wonderful beginnings [white]**<(cool_feature) **
76 ----
77 44
78 include::_aliases.txt[] 45 include::_aliases.txt[]
79 46
80 ---- 47 ----
81 [alias] 48 [alias]
82 git squash = squash-branch 49 git squash = squash-branch
83 ---- 50 ----
84 51
85 52
86 SEE ALSO 53 SEE ALSO
87 -------- 54 --------
88 linkgit:git-rebase-update[1] 55 linkgit:git-rebase-update[1]
89 56
90 include::_footer.txt[] 57 include::_footer.txt[]
91 58
92 // vim: ft=asciidoc: 59 // vim: ft=asciidoc:
OLDNEW
« no previous file with comments | « docs/src/git-new-branch.demo.1.sh ('k') | docs/src/git-squash-branch.demo.1.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698