git.99rst.org Git - git.git/commit

author	Junio C Hamano <redacted>
	Sun, 21 Jun 2009 06:48:21 +0000 (23:48 -0700)
committer	Junio C Hamano <redacted>
	Sun, 21 Jun 2009 06:48:21 +0000 (23:48 -0700)
commit	4258c212ca2c3674be4b7e00a19db705eee77a48
tree	93e421911fc6e07f3dd18ea83aab9bd4ce2dd26e	tree \| snapshot
parent	dfe50511c7e5ec2bc771c9a5f4c3318332a7744e	commit \| diff
parent	d4900ee48c70114ea3227f922d383de6b273fcde	commit \| diff

Merge branch 'maint-1.6.0' into maint-1.6.1

* maint-1.6.0:
  git-show-ref.txt: remove word and make consistent
  git-svn documentation: fix typo in 'rebase vs. pull/merge' section
  use xstrdup, not strdup in ll-merge.c

Documentation/git-svn.txt	diff1 \|	diff2 \|	blob \| history
ll-merge.c	diff1 \|	diff2 \|	blob \| history

RSS Atom

git clone https://git.99rst.org/PROJECT

Documentation/git-svn.txt	diff1 \|	diff2 \|	blob \| history
ll-merge.c	diff1 \|	diff2 \|	blob \| history