| commit | 2ce082cef3fbf0c6614d29a8e7011b09c39899a1 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 3 Nov 2011 21:34:12 +0000 (3 14:34 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 3 Nov 2011 21:34:12 +0000 (3 14:34 -0700) | ||
| tree | b25848c7442e3252dab35dcc0061b7b258c6ccf3 | treesnapshot (tar.gz zip) |
| parent | a0285619763219e7986376236b8ed09369bd8a81 | commitdiff |
| parent | ee6dfb2d83ba1b057943e705f707fa27e34e47f9 | commitdiff |
Merge branch 'master' into next
* master:
receive-pack: do not expect object 0{40} to exist
t3200: add test case for 'branch -m'
branch -m: handle no arg properly
Conflicts:
builtin/branch.c
* master:
receive-pack: do not expect object 0{40} to exist
t3200: add test case for 'branch -m'
branch -m: handle no arg properly
Conflicts:
builtin/branch.c
| builtin/branch.c | diff1 | diff2 | blobhistory |