diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-10-19 14:15:51 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-10-19 14:15:51 -0700 |
| commit | c7deb8dac1f24498a353327ec9fceb99695582c2 (patch) | |
| tree | 58c819d4a87c8e4fed16fdc615ce8579a4230536 /contrib/examples/git-merge.sh | |
| parent | Merge branch 'maint' (diff) | |
| parent | t/t9001-send-email.sh: fix stderr redirection in 'Invalid In-Reply-To' (diff) | |
| download | tgif-c7deb8dac1f24498a353327ec9fceb99695582c2.tar.xz | |
Merge branch 'maint'
* maint:
t/t9001-send-email.sh: fix stderr redirection in 'Invalid In-Reply-To'
Clarify and extend the "git diff" format documentation
git-show-ref.txt: clarify the pattern matching
documentation: git-config minor cleanups
Update test script annotate-tests.sh to handle missing/extra authors
Diffstat (limited to 'contrib/examples/git-merge.sh')
0 files changed, 0 insertions, 0 deletions