git.oblomov.eu Git - git/commit

author	Junio C Hamano <gitster@pobox.com>
	Tue, 15 Jul 2008 06:45:49 +0000 (23:45 -0700)
committer	Junio C Hamano <gitster@pobox.com>
	Tue, 15 Jul 2008 06:45:49 +0000 (23:45 -0700)
commit	633ce9a3ba973acf19a122e1359b7ae724887d70
tree	d360db37cc2c4f64ed85eae77e03f2b98061c9b1	tree \| snapshot
parent	055767194c15f9b7c39a509daf1a77472c77bed8	commit \| diff
parent	9869099bee332e4c351c3aaa15a74786d85909c7	commit \| diff

Merge branch 'jc/rebase-orig-head'

* jc/rebase-orig-head:
Documentation: mention ORIG_HEAD in am, merge, and rebase
Teach "am" and "rebase" to mark the original position with ORIG_HEAD

Documentation/git-am.txt	diff1 \|	diff2 \|	blob \| history
git-am.sh	diff1 \|	diff2 \|	blob \| history
git-rebase--interactive.sh	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

Documentation/git-am.txt	diff1 \|	diff2 \|	blob \| history
git-am.sh	diff1 \|	diff2 \|	blob \| history
git-rebase--interactive.sh	diff1 \|	diff2 \|	blob \| history