]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 170487f ba0ac36)
Merge branch 'sb/fetch'
authorJunio C Hamano <junkio@cox.net>
Thu, 19 Oct 2006 05:08:29 +0000 (22:08 -0700)
committerJunio C Hamano <junkio@cox.net>
Thu, 19 Oct 2006 05:08:29 +0000 (22:08 -0700)
* sb/fetch:
  merge and resolve: Output short hashes and .. in "Updating ..."
  fetch: Misc output cleanup

1  2 
git-fetch.sh patch | diff1 | diff2 | blob | history

diff --cc git-fetch.sh
Simple merge
Unnamed repository; edit this file 'description' to name the repository.