Merge branch 'tr/maint-merge-ours-clarification' (early part)
authorJunio C Hamano <gitster@pobox.com>
Mon, 23 Nov 2009 00:28:06 +0000 (16:28 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 23 Nov 2009 00:28:06 +0000 (16:28 -0800)
commitc50230f...5109677d7adf0bd94f99d17f35a519a6
tree58d077c...74e804bbd40133505fa0ee8d72c4a28dcopy hash to clipboard (tree)
parent3288f20...71ce6aee5d9d51d111ee17cd4b426af4copy hash to clipboard (diff)
parent31ddd1e...0fdd0a03001994d362023a04d8231eb0copy hash to clipboard (diff)
Documentation/git-rebase.txt