summaryrefslogtreecommitdiff
path: root/compat/setenv.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-03-26 00:26:47 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-03-26 00:26:47 -0700
commit23fd723c9dfbe9b558c0d9a46696ca93f93bab04 (patch)
tree93a6e9ad79fb71d08ddf7b609d25d7c697dc5c46 /compat/setenv.c
parentMerge branch 'fg/push-default' (diff)
parentgit-branch: display "was sha1" on branch deletion rather than just "sha1" (diff)
downloadtgif-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 'compat/setenv.c')
0 files changed, 0 insertions, 0 deletions