diff options
author | Junio C Hamano <gitster@pobox.com> | 2009-03-26 00:26:47 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-03-26 00:26:47 -0700 |
commit | 23fd723c9dfbe9b558c0d9a46696ca93f93bab04 (patch) | |
tree | 93a6e9ad79fb71d08ddf7b609d25d7c697dc5c46 /contrib/p4import/git-p4import.py | |
parent | Merge branch 'fg/push-default' (diff) | |
parent | git-branch: display "was sha1" on branch deletion rather than just "sha1" (diff) | |
download | tgif-23fd723c9dfbe9b558c0d9a46696ca93f93bab04.tar.xz |
Merge branch 'bc/maint-1.6.1-branch-deleted-was'
* bc/maint-1.6.1-branch-deleted-was:
git-branch: display "was sha1" on branch deletion rather than just "sha1"
Conflicts:
builtin-branch.c
Diffstat (limited to 'contrib/p4import/git-p4import.py')
0 files changed, 0 insertions, 0 deletions