diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-09-29 23:32:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-09-29 23:32:36 -0700 |
| commit | 2af89f12c666634e92cd79a6c1af6acc34104c34 (patch) | |
| tree | 6f5ccd286e8741b41d3384025e1df43194ff2feb /Documentation | |
| parent | f8babc4dabebebd9e95537df6da0408c1c178615 (diff) | |
| parent | f4bb20cc99fe18ba0e7dd421f1d95a05c1cbbc93 (diff) | |
| download | git-2af89f12c666634e92cd79a6c1af6acc34104c34.tar.gz git-2af89f12c666634e92cd79a6c1af6acc34104c34.tar.xz | |
Merge branch 'maint'
* maint:
git-remote: exit with non-zero status after detecting errors.
rebase -i: squash should retain the authorship of the _first_ commit
git-add--interactive: Improve behavior on bogus input
git-add--interactive: Allow Ctrl-D to exit
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-rebase.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 0858fa8a6..e8e75790f 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -298,7 +298,7 @@ rebasing. If you want to fold two or more commits into one, replace the command "pick" with "squash" for the second and subsequent commit. If the commits had different authors, it will attribute the squashed commit to -the author of the last commit. +the author of the first commit. In both cases, or when a "pick" does not succeed (because of merge errors), the loop will stop to let you fix things, and you can continue |