granicus.if.org Git - git/commit

]> granicus.if.org Git - git/commit

author	Junio C Hamano <gitster@pobox.com>
	Fri, 12 Jul 2013 19:04:06 +0000 (12:04 -0700)
committer	Junio C Hamano <gitster@pobox.com>
	Fri, 12 Jul 2013 19:04:06 +0000 (12:04 -0700)
commit	5b307e95e880b95eafd36e93251c6638c222dcf4
tree	0d511facc0fe5969d5b923dde557349997be5a19	tree \| snapshot
parent	e70aee5c86c508af4a92bd02b688b4aa39c58180	commit \| diff
parent	153d7265ef1277c1c9971780ad035a530e305f78	commit \| diff

Merge branch 'jk/pull-to-integrate'

* jk/pull-to-integrate:
pull: change the description to "integrate" changes
push: avoid suggesting "merging" remote changes

builtin/push.c	diff1 \|	diff2 \|	blob \| history
git-pull.sh	diff1 \|	diff2 \|	blob \| history

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

RSS Atom

builtin/push.c	diff1 \|	diff2 \|	blob \| history
git-pull.sh	diff1 \|	diff2 \|	blob \| history