summaryrefslogtreecommitdiff
path: root/git-sh-setup.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-03-26 00:26:47 -0700
committerJunio C Hamano <gitster@pobox.com>2009-03-26 00:26:47 -0700
commit23fd723c9dfbe9b558c0d9a46696ca93f93bab04 (patch)
tree93a6e9ad79fb71d08ddf7b609d25d7c697dc5c46 /git-sh-setup.sh
parent2545c089e329d340a9bdec9f725fa737063dd7f6 (diff)
parent76aac715465b7678ca5b834ccbdcb88a3ab8a9f4 (diff)
downloadgit-23fd723c9dfbe9b558c0d9a46696ca93f93bab04.tar.gz
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 'git-sh-setup.sh')
0 files changed, 0 insertions, 0 deletions