| commit | a8264bf01b25c808be709fba54b4d8f0acc5255c | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 25 Apr 2013 17:47:37 +0000 (25 10:47 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 25 Apr 2013 17:47:37 +0000 (25 10:47 -0700) | ||
| tree | 76458c76227f18490346abb1cae40394e273cd28 | treesnapshot (tar.gz zip) |
| parent | 152cb06015401e21de48534126631f404d4ab207 | commitdiff |
| parent | b71dc3e1a04666fae4a4e282973d9b5a122a997c | commitdiff |
Merge branch 'zk/prompt-rebase-step' into next
* zk/prompt-rebase-step:
bash-prompt.sh: show where rebase is at when stopped
* zk/prompt-rebase-step:
bash-prompt.sh: show where rebase is at when stopped
| contrib/completion/git-prompt.sh | diff1 | diff2 | blobhistory |
| t/t9903-bash-prompt.sh | diff1 | diff2 | blobhistory |