aboutsummaryrefslogtreecommitdiff
path: root/Documentation/gitattributes.txt
diff options
context:
space:
mode:
authorMatt Kraai <kraai@ftbfs.org>2007-09-25 18:30:13 -0700
committerJunio C Hamano <gitster@pobox.com>2007-09-26 00:39:09 -0700
commit5166810b1e16b22e342f2181a3535e70c6e7a119 (patch)
tree68865d516bbd5e522a0f5a4552076f6ea0b24de8 /Documentation/gitattributes.txt
parentae830ed7f50377e64b774ce87441ff4538f04ad7 (diff)
downloadgit-5166810b1e16b22e342f2181a3535e70c6e7a119.tar.gz
git-5166810b1e16b22e342f2181a3535e70c6e7a119.tar.xz
rebase -i: create .dotest-merge after validating options.
Creating .dotest-merge before validating the options prevents both --continue and --interactive from working if the options are invalid, so only create it after validating the options. [jc: however, just moving the creation of DOTEST breaks output] Signed-off-by: Matt Kraai <kraai@ftbfs.org> Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/gitattributes.txt')
0 files changed, 0 insertions, 0 deletions