git, branch v2.4.0-rc1Fork of git SCM with my patches.http://git.kilabit.info/git/atom?h=v2.4.0-rc12015-04-02T19:46:06ZGit 2.4.0-rc12015-04-02T19:46:06ZJunio C Hamanogitster@pobox.com2015-04-02T19:46:06Zurn:sha1:6ae0d972664134b82a6dd164a01e8adbebeaffe3
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Merge branch 'sb/atomic-push'2015-04-02T19:34:43ZJunio C Hamanogitster@pobox.com2015-04-02T19:34:43Zurn:sha1:3c6151dad310db71f599dbfbac329fa961f29794
* sb/atomic-push:
send-pack: unify error messages for unsupported capabilities
send-pack: unify error messages for unsupported capabilities2015-04-02T18:02:52ZRalf Thielowralf.thielow@gmail.com2015-04-02T17:28:48Zurn:sha1:c8b8f22aa97a94dbad4fb7d8dcb2c5bf21c4fa32
If --signed is not supported, the error message names the remote
"receiving end". If --atomic is not supported, the error message
names the remote "server". Unify the naming to "receiving end"
as we're in the context of "push".
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Sync with 2.3.52015-03-31T21:58:38ZJunio C Hamanogitster@pobox.com2015-03-31T21:58:38Zurn:sha1:cf8a8c6bd53c43e29cb735eb7934ffc996475d77
* maint:
Git 2.3.5
docs: clarify what git-rebase's "-p" / "--preserve-merges" does
Git 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>
Sync with maint2015-03-28T16:42:49ZJunio C Hamanogitster@pobox.com2015-03-28T16:42:49Zurn:sha1:a3b75b3ccbc0f8128937d3b393837c2a74f2b662
* maint:
Prepare for 2.3.5
2.3.2 release notes: typofix