diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-04-16 00:45:52 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-04-16 00:45:52 -0700 |
| commit | a17b1d2f0b3128be6f116bf22b58244b310d27b9 (patch) | |
| tree | 6c1fc3fe2a6630902bbd37f45d3e94437a5039b2 /t/t7004/pubring.gpg | |
| parent | Merge branch 'maint' (diff) | |
| parent | Merge branch 'maint-1.5.4' into maint (diff) | |
| download | tgif-a17b1d2f0b3128be6f116bf22b58244b310d27b9.tar.xz | |
Merge branch 'maint'
* maint:
git-bisect: make "start", "good" and "skip" succeed or fail atomically
git-am: cope better with an empty Subject: line
Ignore leading empty lines while summarizing merges
bisect: squelch "fatal: ref HEAD not a symref" misleading message
builtin-apply: Show a more descriptive error on failure when opening a patch
Clarify documentation of git-cvsserver, particularly in relation to git-shell
Diffstat (limited to 't/t7004/pubring.gpg')
0 files changed, 0 insertions, 0 deletions