diff options
| author | David D. Kilzer <ddkilzer@kilzer.net> | 2010-07-28 01:20:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-07-28 13:57:36 -0700 |
| commit | 25e932504096ad5cba21978a0b9a13e2708bae87 (patch) | |
| tree | e5742063c2b6de345882d8abf0095b1dc83e8acf /git-gui/macosx/AppMain.tcl | |
| parent | Document ls-files -t as semi-obsolete. (diff) | |
| download | git-25e932504096ad5cba21978a0b9a13e2708bae87.tar.gz git-25e932504096ad5cba21978a0b9a13e2708bae87.zip | |
Fix git rebase --continue to work with touched files
When performing a non-interactive rebase, sometimes
"git rebase --continue" will fail if an unmodified file is
touched in the working directory:
You must edit all merge conflicts and then
mark them as resolved using git add
This is caused by "git diff-files" reporting a difference
between the index and the filesystem:
:100644 100644 d00491...... 000000...... M file
The fix is to run "git update-index --refresh" before
"git diff-files" as is done in git-rebase--interactive.
Signed-off-by: David D. Kilzer <ddkilzer@kilzer.net>
Acked-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-gui/macosx/AppMain.tcl')
0 files changed, 0 insertions, 0 deletions