git, branch v2.3.5Mirror of https://git.kernel.org/pub/scm/git/git.git/
https://www.git.shady.money/git/atom?h=v2.3.52015-03-31T21:57:10ZGit 2.3.52015-03-31T21:57:10ZJunio C Hamanogitster@pobox.com2015-03-31T21:57:10Zurn:sha1:52735a689270bb1de94eb3de198594b36caed9bb
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Merge branch 'ss/pull-rebase-preserve' into maint2015-03-31T21:54:12ZJunio C Hamanogitster@pobox.com2015-03-31T21:54:11Zurn:sha1:ad00aebfe93b3fc79c5ed54569f1603b8030783a
* ss/pull-rebase-preserve:
docs: clarify what git-rebase's "-p" / "--preserve-merges" does
docs: clarify "preserve" option wording for git-pull
Merge branch 'jc/report-path-error-to-dir' into maint2015-03-31T21:53:08ZJunio C Hamanogitster@pobox.com2015-03-31T21:53:08Zurn:sha1:ab0fb57aac6c5b6f074c07c7e2729bcff58cc45d
Code clean-up.
* jc/report-path-error-to-dir:
report_path_error(): move to dir.c
Merge branch 'ph/push-doc-cas' into maint2015-03-31T21:52:24ZJunio C Hamanogitster@pobox.com2015-03-31T21:52:23Zurn:sha1:a78fc4af8246e06de4fc10f685a84778cf33aa12
* ph/push-doc-cas:
git-push.txt: clean up force-with-lease wording
docs: clarify what git-rebase's "-p" / "--preserve-merges" does2015-03-30T20:44:29ZSebastian Schuberthsschuberth@gmail.com2015-03-30T09:29:46Zurn:sha1:d50d31e8808261eccfa6bde826e5e63368e29573
Ignoring a merge can be read as ignoring the changes a merge commit
introduces altogether, as if the entire side branch the merge commit
merged was removed from the history. But that is not what happens
if "-p" is not specified. What happens is that the individual
commits a merge commit introduces are replayed in order, and only
any possible merge conflict resolutions or manual amendments to the
merge commit are ignored.
Get this straight in the docs.
Also, do not say that merge commits are *tried* to be recreated. As that is
true almost everywhere it is better left unsaid.
Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Prepare for 2.3.52015-03-28T16:36:30ZJunio C Hamanogitster@pobox.com2015-03-28T16:36:30Zurn:sha1:2c97724d5ea59677b18b7a1cc50a250b6ff459e5
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Merge branch 'sg/completion-gitcomp-nl-for-refs' into maint2015-03-28T16:33:15ZJunio C Hamanogitster@pobox.com2015-03-28T16:33:15Zurn:sha1:4eea8e3fa0c41137d7126a0ff262eb7a85991b90
Code clean-up.
* sg/completion-gitcomp-nl-for-refs:
completion: use __gitcomp_nl() for completing refs
Merge branch 'jk/simplify-csum-file-sha1fd-check' into maint2015-03-28T16:33:15ZJunio C Hamanogitster@pobox.com2015-03-28T16:33:15Zurn:sha1:a070d621ed8e84a06ca6b710560c691dbf475b4a
Code simplification.
* jk/simplify-csum-file-sha1fd-check:
sha1fd_check: die when we cannot open the file
Merge branch 'tg/test-index-v4' into maint2015-03-28T16:33:14ZJunio C Hamanogitster@pobox.com2015-03-28T16:33:14Zurn:sha1:b265061937b2b0077a37b44a463fe60e1d55156c
A test fix.
* tg/test-index-v4:
t1700: make test pass with index-v4
Merge branch 'nd/doc-git-index-version' into maint2015-03-28T16:33:13ZJunio C Hamanogitster@pobox.com2015-03-28T16:33:13Zurn:sha1:2217579cde1d3a96446f8435f6fb4a89925d599a
Doc clean-up.
* nd/doc-git-index-version:
git.txt: list index versions in plain English