kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity
67,130 Commits
6 Branches
986 Tags
177 MiB
Commit Graph

3 Commits (a34edae68a26f8f97f6ba69f408abbd3480ed90c)

Author SHA1 Message Date
martin f. krafft b80da424a1 git-am: implement --reject option passed to git-apply 
With --reject, git-am simply passes the --reject option to git-apply and thus
allows people to work with reject files if they so prefer.

Signed-off-by: martin f. krafft <madduck@madduck.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2009-01-23 17:00:12 -08:00
Junio C Hamano b47dfe9e9c git-am: add --directory=<dir> option 
Thanks to a200337 (git-am: propagate -C<n>, -p<n> options as well,
2008-12-04) and commits around it, "git am" is equipped to correctly
propagate the command line flags such as -C/-p/-whitespace across a patch
failure and restart.

It is trivial to support --directory option now, resurrecting previous
attempts by Kevin and Simon.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2009-01-12 02:26:01 -08:00
Junio C Hamano fe6beab7e8 Test that git-am does not lose -C/-p/--whitespace options 
These tests make sure that "git am" does not lose command line options
specified when it was started, after it is interrupted by a patch that
does not apply earlier in the series.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2008-12-04 18:45:02 -08:00