| commit | 1306321ebea4d789974f0d58062664cc35c411e8 | |
| author | Felipe Contreras <felipe.contreras@gmail.com> | |
| Wed, 29 May 2013 06:21:28 +0000 (29 01:21 -0500) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 29 May 2013 18:27:56 +0000 (29 11:27 -0700) | ||
| tree | 6bd827689260ccf16400ccb5783e66b5df6ebda3 | treesnapshot (tar.gz zip) |
| parent | edca4152560522a431a51fc0a06147fc680b5b18 | commitdiff |
prompt: fix for simple rebase
When we are rebasing without options ('am' mode), the head rebased lives
in '$g/rebase-apply/head-name', so lets use that information so it's
reported the same way as if we were doing other rebases (-i or -m).
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
When we are rebasing without options ('am' mode), the head rebased lives
in '$g/rebase-apply/head-name', so lets use that information so it's
reported the same way as if we were doing other rebases (-i or -m).
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| contrib/completion/git-prompt.sh | diffblobblamehistory | |
| t/t9903-bash-prompt.sh | diffblobblamehistory |