diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-09-02 17:10:08 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-09-02 17:10:08 -0700 |
| commit | 106db883b791efb7f39f3b2f8553236ba792a89e (patch) | |
| tree | 4589463a8d7a3f2f42bfc1bb0ef72d0ad7c852a3 /git-merge-resolve.sh | |
| parent | Merge branch 'maint' (diff) | |
| parent | Makefile: add merge_recursive.h to LIB_H (diff) | |
| download | tgif-106db883b791efb7f39f3b2f8553236ba792a89e.tar.xz | |
Merge branch 'maint'
* maint:
Makefile: add merge_recursive.h to LIB_H
Improve documentation for --dirstat diff option
Bring local clone's origin URL in line with that of a remote clone
Documentation: minor cleanup in a use case in 'git stash' manual
Documentation: fix disappeared lines in 'git stash' manpage
Documentation: fix reference to a for-each-ref option
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions