aboutsummaryrefslogtreecommitdiff
path: root/exec_cmd.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-04-02 12:02:18 -0700
committerJunio C Hamano <gitster@pobox.com>2009-04-02 12:02:18 -0700
commit8afd3178437eef29a08ba21aceb47a94177409d5 (patch)
tree533fedcb0e579f28157dd12340fe9f962b506921 /exec_cmd.c
parentb5a18787bd5c757b49a7ea4fdd73e62a1fee35de (diff)
parent76aac715465b7678ca5b834ccbdcb88a3ab8a9f4 (diff)
downloadgit-8afd3178437eef29a08ba21aceb47a94177409d5.tar.gz
git-8afd3178437eef29a08ba21aceb47a94177409d5.tar.xz
Merge branch 'bc/maint-1.6.1-branch-deleted-was' into maint
* 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 'exec_cmd.c')
0 files changed, 0 insertions, 0 deletions