diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2018-02-11 09:43:28 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-02-12 22:07:59 (GMT) |
| commit | fbd7a23237094c3fb2e249bbcacbbf1e858e79c9 (patch) | |
| tree | e6d0c78248f7bd326f68baafc894bff7cb75eb2a /Documentation/git-rebase.txt | |
| parent | 66335298a47032267edd6d6e7a71cc337e46e995 (diff) | |
| download | git-fbd7a23237094c3fb2e249bbcacbbf1e858e79c9.zip git-fbd7a23237094c3fb2e249bbcacbbf1e858e79c9.tar.gz git-fbd7a23237094c3fb2e249bbcacbbf1e858e79c9.tar.bz2 | |
rebase: introduce and use pseudo-ref REBASE_HEAD
The new command `git rebase --show-current-patch` is useful for seeing
the commit related to the current rebase state. Some however may find
the "git show" command behind it too limiting. You may want to
increase context lines, do a diff that ignores whitespaces...
For these advanced use cases, the user can execute any command they
want with the new pseudo ref REBASE_HEAD.
This also helps show where the stopped commit is from, which is hard
to see from the previous patch which implements --show-current-patch.
Helped-by: Tim Landscheidt <tim@tim-landscheidt.de>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-rebase.txt')
| -rw-r--r-- | Documentation/git-rebase.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 7ef9577..0b29e48 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -252,7 +252,8 @@ leave out at most one of A and B, in which case it defaults to HEAD. --show-current-patch:: Show the current patch in an interactive rebase or when rebase - is stopped because of conflicts. + is stopped because of conflicts. This is the equivalent of + `git show REBASE_HEAD`. -m:: --merge:: |