diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-05-11 11:13:26 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-05-11 11:13:26 -0700 |
| commit | 0582afbcb33a7ca32d09620b8dcaee63c5dd6000 (patch) | |
| tree | 87fa785a581377342a50450cbae925fb771f5664 /builtin/merge-recursive.c | |
| parent | document submdule.$name.update=none option for gitmodules (diff) | |
| parent | rev-parse --show-prefix: add in trailing newline (diff) | |
| download | tgif-0582afbcb33a7ca32d09620b8dcaee63c5dd6000.tar.xz | |
Merge branch 'rl/show-empty-prefix' into maint
Unlike "git rev-parse --show-cdup", "--show-prefix" did not give an
empty line when run at the top of the working tree.
By Ross Lagerwall
* rl/show-empty-prefix:
rev-parse --show-prefix: add in trailing newline
Diffstat (limited to 'builtin/merge-recursive.c')
0 files changed, 0 insertions, 0 deletions