summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-index.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2006-05-06 00:20:54 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2006-05-06 00:20:54 -0700
commitaadc81c13bbb103e7db759ba9a98a6f9509831f1 (patch)
treedc663c8aa0a076a080a81a290f64d8c2474b6e10 /Documentation/git-merge-index.txt
parentMerge branch 'jc/bindiff' into next (diff)
parentupdate-index --again: take optional pathspecs (diff)
downloadtgif-aadc81c13bbb103e7db759ba9a98a6f9509831f1.tar.xz
Merge branch 'jc/reupdate' into next
* jc/reupdate: update-index --again: take optional pathspecs update-index --again update-index: plug memory leak from prefix_path() checkout-index: plug memory leak from prefix_path() update-index --unresolve: work from a subdirectory.
Diffstat (limited to 'Documentation/git-merge-index.txt')
0 files changed, 0 insertions, 0 deletions