summaryrefslogtreecommitdiff
path: root/git-merge-one-file.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2008-03-27 13:03:56 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-03-27 13:03:56 -0700
commitb88605f6d4b2b1b8dd805da9e91feccb68b4c840 (patch)
tree8dd5d794d7c61220ef9c7055f1fdf18f71f6b1a5 /git-merge-one-file.sh
parentDocumentation: clarify use of .git{ignore,attributes} versus .git/info/* (diff)
parentgit-fetch test: test tracking fetch results, not just FETCH_HEAD (diff)
downloadtgif-b88605f6d4b2b1b8dd805da9e91feccb68b4c840.tar.xz
Merge branch 'jc/maint-fetch-regression-1.5.4' into maint
* jc/maint-fetch-regression-1.5.4: git-fetch test: test tracking fetch results, not just FETCH_HEAD Fix branches file configuration Tighten refspec processing
Diffstat (limited to 'git-merge-one-file.sh')
0 files changed, 0 insertions, 0 deletions