diff options
author | Junio C Hamano <gitster@pobox.com> | 2009-03-12 23:36:57 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-03-12 23:36:57 -0700 |
commit | bf0fe35c938ac9f03d1369600b0c76e428a57507 (patch) | |
tree | 528be1c6679b5f869d199e38be1777eac352eeb1 /cache-tree.h | |
parent | Merge branch 'en/maint-1.6.1-hash-object' into maint-1.6.1 (diff) | |
parent | Merge branch 'ks/maint-1.6.0-mailinfo-folded' into maint-1.6.0 (diff) | |
download | tgif-bf0fe35c938ac9f03d1369600b0c76e428a57507.tar.xz |
Merge branch 'maint-1.6.0' into maint-1.6.1
* maint-1.6.0:
bisect: fix another instance of eval'ed string
bisect: fix quoting TRIED revs when "bad" commit is also "skip"ped
Support "\" in non-wildcard exclusion entries
Conflicts:
git-bisect.sh
Diffstat (limited to 'cache-tree.h')
0 files changed, 0 insertions, 0 deletions