Fork of git SCM with my patches. http://git.kilabit.info/git/atom?h=v1.7.10.5 2012-06-17T21:04:15Z 2012-06-17T21:04:15Z Junio C Hamano gitster@pobox.com 2012-06-17T21:04:15Z urn:sha1:785ee4960c3d334cbc2b17ab74d2cebdf1b4db64 Signed-off-by: Junio C Hamano <gitster@pobox.com> 2012-06-17T21:01:42Z Vincent van Ravesteijn vfr@lyx.org 2012-05-24T13:57:26Z urn:sha1:941cab3a78a3fd3d21ba3acb3f8da3407a692015 The option to autosquash is only used in case of an interactive rebase. When merges are preserved, rebase uses an interactive rebase internally, but in this case autosquash should still be disabled. Signed-off-by: Vincent van Ravesteijn <vfr@lyx.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2012-06-17T21:00:03Z Junio C Hamano gitster@pobox.com 2012-06-17T21:00:03Z urn:sha1:ca4effd8bce5e0dfce7ce1425074475c8643b7f0 "git fast-export" did not give a readable error message when the same mark erroneously appeared twice in the --import-marks input. 2012-06-12T14:25:11Z Johannes Schindelin johannes.schindelin@gmx.de 2012-06-12T13:45:16Z urn:sha1:43bc2302706af6a3bb9266eea1bcb7071c54c8c6 Cc: Pieter de Bie <pdebie@ai.rug.nl> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Max Horn <max@quendi.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2012-06-03T22:53:58Z Junio C Hamano gitster@pobox.com 2012-06-03T22:53:58Z urn:sha1:121f71f0da1bc9a4e1e96be2c3e683191a82a354 Signed-off-by: Junio C Hamano <gitster@pobox.com> 2012-06-03T22:52:18Z Junio C Hamano gitster@pobox.com 2012-06-03T22:52:18Z urn:sha1:06de561830250f92e056b0a57bc52b27b13ba2ac When "git rebase" was given a bad commit to replay the history on, its error message did not correctly give the command line argument it had trouble parsing. By Erik Faye-Lund * ef/maint-rebase-error-message: rebase: report invalid commit correctly 2012-06-01T20:23:11Z Junio C Hamano gitster@pobox.com 2012-06-01T20:05:27Z urn:sha1:6a6d72b199fda7189b772640ca35ceb13708332d Signed-off-by: Junio C Hamano <gitster@pobox.com> 2012-06-01T20:22:44Z Junio C Hamano gitster@pobox.com 2012-06-01T20:22:44Z urn:sha1:0626fae6afc9c6976aead4237691fb3568dd5c68 A minor compilation fix. By Erik Faye-Lund * ef/http-o-depends-on-gvf: Makefile: add missing GIT-VERSION-FILE dependency 2012-06-01T20:01:41Z Junio C Hamano gitster@pobox.com 2012-06-01T20:01:41Z urn:sha1:2147cb2762c67d0ec2101ab13a4c1b0ef8cab599 "git grep -e '$pattern'", unlike the case where the patterns are read from a file, did not treat individual lines in the given pattern argument as separate regular expressions as it should. By René Scharfe * rs/maint-grep-F: grep: stop leaking line strings with -f grep: support newline separated pattern list grep: factor out do_append_grep_pat() grep: factor out create_grep_pat() 2012-06-01T20:01:36Z Junio C Hamano gitster@pobox.com 2012-06-01T20:01:36Z urn:sha1:e2d484c47a3445a288f4e45ee8365c912eebb26f An author/committer name that is a single character was mishandled as an invalid name by mistake. By Jeff King * jk/ident-split-fix: fix off-by-one error in split_ident_line