]> git.tokkee.org Git - git.git/commitdiff
[tokkee]

tokkee.org

Code

projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f8d186b f772c34)
Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Mon, 15 Nov 2010 19:00:24 +0000 (11:00 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 15 Nov 2010 19:00:24 +0000 (11:00 -0800)
* maint:
  rebase -X: do not clobber strategy


Trivial merge
Git - the stupid content tracker