diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-10-28 11:21:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-10-28 11:21:46 -0700 |
| commit | cd0f8e6d63d3e2744d7d3b2329238be7d064a8ea (patch) | |
| tree | 1dec0df37dae5154604064c4c8a8b50e90058a16 /xdiff/xmerge.c | |
| parent | commit: More generous accepting of RFC-2822 footer lines. (diff) | |
| parent | help -a: do not unnecessarily look for a repository (diff) | |
| download | tgif-cd0f8e6d63d3e2744d7d3b2329238be7d064a8ea.tar.xz | |
Merge branch 'maint'
* maint:
help -a: do not unnecessarily look for a repository
Do not try to remove directories when removing old links
rebase -i: more graceful handling of invalid commands
help -i: properly error out if no info viewer can be found
Diffstat (limited to 'xdiff/xmerge.c')
0 files changed, 0 insertions, 0 deletions