]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 716b64a 6d9990a)
Merge branch 'jm/mergetool-pathspec' into maint-1.7.6
authorJunio C Hamano <gitster@pobox.com>
Wed, 26 Oct 2011 23:12:25 +0000 (16:12 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 26 Oct 2011 23:12:25 +0000 (16:12 -0700)
commit87d99c64dfa8880592104245896557aa530d4fd9
treebaf019f2b0272eb4a6033d9f1c78f0f80be9d665tree | snapshot
parent716b64a73e65d7494dfb37631292fcbe8cb34cc0commit | diff
parent6d9990a959c0168ab6dfe75236980f95ac512ce5commit | diff
Merge branch 'jm/mergetool-pathspec' into maint-1.7.6

* jm/mergetool-pathspec:
  mergetool: no longer need to save standard input
  mergetool: Use args as pathspec to unmerged files
Documentation/git-mergetool.txt diff1 | diff2 | blob | history
git-mergetool.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.