summaryrefslogtreecommitdiff
path: root/git-merge-resolve.sh
diff options
context:
space:
mode:
authorKevin Ballard <kevin@sb.org>2010-11-04 22:36:31 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-11-09 17:43:54 (GMT)
commitd3d7a421b1439a6f08dfbcd2e3327cbe90c93417 (patch)
tree15cde829d267f7d92b7005b13f8d80978219bfe1 /git-merge-resolve.sh
parentaf77aee9cac51c2036e6019b4aebec2049f03e6b (diff)
downloadgit-d3d7a421b1439a6f08dfbcd2e3327cbe90c93417.zip
git-d3d7a421b1439a6f08dfbcd2e3327cbe90c93417.tar.gz
git-d3d7a421b1439a6f08dfbcd2e3327cbe90c93417.tar.bz2
rebase: better rearranging of fixup!/squash! lines with --autosquash
The current behvaior of --autosquash can duplicate fixup!/squash! lines if they match multiple commits, and it can also apply them to commits that come after them in the todo list. Even more oddly, a commit that looks like "fixup! fixup!" will match itself and be duplicated in the todo list. Change the todo list rearranging to mark all commits as used as soon as they are emitted, and to avoid emitting a fixup/squash commit if the commit has already been marked as used. Signed-off-by: Kevin Ballard <kevin@sb.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions