diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-06-06 12:18:41 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-06 12:18:41 -0700 |
| commit | 5adb37410198bc1d2413df9100bfd5c9f5d844f2 (patch) | |
| tree | 88965e2e39df491a944391791c586fd384b210cb /merge-blobs.h | |
| parent | 72e719292d5dd6e037fecbc3a1c5e4d4f21f03b8 (diff) | |
| parent | 1306321ebea4d789974f0d58062664cc35c411e8 (diff) | |
Merge branch 'fc/show-branch-in-rebase-am'
The bash prompt code (in contrib/) displayed the name of the branch
being rebased when "rebase -i/-m/-p" modes are in use, but not the
plain vanilla "rebase".
* fc/show-branch-in-rebase-am:
prompt: fix for simple rebase
Diffstat (limited to 'merge-blobs.h')
0 files changed, 0 insertions, 0 deletions