summaryrefslogtreecommitdiff
path: root/git-rebase--merge.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-01-18 15:48:46 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-01-18 15:48:46 -0800
commitd899cf559b6a93006993752e7a89d13606380227 (patch)
tree267c22ffce9a9d705f48749d650ce2b62b690aa8 /git-rebase--merge.sh
parentUpdate draft release notes to 1.7.8.4 (diff)
parentGit 1.7.7.6 (diff)
downloadtgif-d899cf559b6a93006993752e7a89d13606380227.tar.xz
Merge branch 'maint-1.7.7' into maint
* maint-1.7.7: Git 1.7.7.6 diff-index: enable recursive pathspec matching in unpack_trees Conflicts: GIT-VERSION-GEN
Diffstat (limited to 'git-rebase--merge.sh')
0 files changed, 0 insertions, 0 deletions