git/Documentation/git.txt, branch v2.4.0Mirror of https://git.kernel.org/pub/scm/git/git.git/
https://git.shady.money/git/atom?h=v2.4.02015-04-30T18:25:06ZGit 2.42015-04-30T18:25:06ZJunio C Hamanogitster@pobox.com2015-04-30T18:25:06Zurn:sha1:3d4a3ffe64162b45ae7c991fc60623ecb4678cfd
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Sync with 2.3.72015-04-27T19:26:21ZJunio C Hamanogitster@pobox.com2015-04-27T19:26:21Zurn:sha1:fb3e7d5515308c73c54c797356651d6ca41b58a6Git 2.3.72015-04-27T19:25:36ZJunio C Hamanogitster@pobox.com2015-04-27T19:25:36Zurn:sha1:16018ae5fb368151f3eff13730cf089b63f41962
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Sync with maint2015-04-21T19:58:50ZJunio C Hamanogitster@pobox.com2015-04-21T19:58:50Zurn:sha1:fb896362cc12dfc0df69be6c9d75936f9c7cc7ffGit 2.3.62015-04-21T19:17:09ZJunio C Hamanogitster@pobox.com2015-04-21T19:17:09Zurn:sha1:ba63bfaa59ee41bd679286a594cc643b5a53c48d
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 '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
Merge branch 'jk/prune-with-corrupt-refs' into maint2015-03-28T16:33:06ZJunio C Hamanogitster@pobox.com2015-03-28T16:33:06Zurn:sha1:9f389aa4920f147a6314719741b47074b2e4b727
"git prune" used to largely ignore broken refs when deciding which
objects are still being used, which could spread an existing small
damage and make it a larger one.
* jk/prune-with-corrupt-refs:
refs.c: drop curate_packed_refs
repack: turn on "ref paranoia" when doing a destructive repack
prune: turn on ref_paranoia flag
refs: introduce a "ref paranoia" flag
t5312: test object deletion code paths in a corrupted repository
Merge branch 'nd/doc-git-index-version'2015-03-25T19:54:28ZJunio C Hamanogitster@pobox.com2015-03-25T19:54:28Zurn:sha1:6ce3cc5d330f9a98058e509bb7d71affeb181d47
Doc clean-up.
* nd/doc-git-index-version:
git.txt: list index versions in plain English