aboutsummaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-01-11 22:21:48 -0800
committerJunio C Hamano <gitster@pobox.com>2009-01-12 02:26:01 -0800
commitb47dfe9e9c86be97fc07c4c04e26a303730f76c6 (patch)
treeac70929812c01e40e797abf3c53cbf13bc53ccdc /merge-recursive.c
parentd727f676ad9f03c2b2a11ea68a2c6242ca02fa10 (diff)
downloadgit-b47dfe9e9c86be97fc07c4c04e26a303730f76c6.tar.gz
git-b47dfe9e9c86be97fc07c4c04e26a303730f76c6.tar.xz
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>
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions