]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cf7a64b 4a689af)
Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Fri, 17 Dec 2010 00:36:03 +0000 (16:36 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 17 Dec 2010 00:36:03 +0000 (16:36 -0800)
* maint:
  difftool: provide basename to external tools
  git-difftool.txt: correct the description of $BASE and describe $MERGED

1  2 
Documentation/git-difftool.txt patch | diff1 | diff2 | blob | history

diff --cc Documentation/git-difftool.txt
Simple merge
Unnamed repository; edit this file 'description' to name the repository.