]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7ddd582 6d9990a)
Merge branch 'jm/mergetool-pathspec'
authorJunio C Hamano <gitster@pobox.com>
Mon, 10 Oct 2011 22:56:18 +0000 (15:56 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 10 Oct 2011 22:56:18 +0000 (15:56 -0700)
commit5fbdb9c2e8cc7226d9a9e7de5ad09ac5f0a0b906
tree76972a1c5eebdc2ade46704ac95b04c712e5321btree | snapshot
parent7ddd582402aa926d5ec33d914ccc8bfaf1b15c06commit | diff
parent6d9990a959c0168ab6dfe75236980f95ac512ce5commit | diff
Merge branch 'jm/mergetool-pathspec'

* 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.