]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 25756cf fe249b4)
Merge branch 'mz/pull-rebase-rebased'
authorJunio C Hamano <gitster@pobox.com>
Mon, 13 Dec 2010 05:49:51 +0000 (21:49 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 13 Dec 2010 05:49:51 +0000 (21:49 -0800)
* mz/pull-rebase-rebased:
  Use reflog in 'pull --rebase . foo'

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

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