aboutsummaryrefslogtreecommitdiff
path: root/t/t4252
Commit message (Collapse)AuthorAge
* git-am: implement --reject option passed to git-applymartin f. krafft2009-01-23
| | | | | | | | 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>
* git-am: add --directory=<dir> optionJunio C Hamano2009-01-12
| | | | | | | | | | | | 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>
* Test that git-am does not lose -C/-p/--whitespace optionsJunio C Hamano2008-12-04
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>