chiark
/
gitweb
/
~mdw
/
stgit
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from:
718a5e5
)
Notify when a patch was modified during a push operation
author
Catalin Marinas
<catalin.marinas@gmail.com>
Thu, 27 Oct 2005 19:47:24 +0000
(20:47 +0100)
committer
Catalin Marinas
<catalin.marinas@gmail.com>
Thu, 27 Oct 2005 19:47:24 +0000
(20:47 +0100)
The logic of this is that when a "git-diff | git-apply" succeeds, the patch
is reported as unmodified. If the the above operation fails and the command
falls back to a three-way merge, the patch will be reported as modified.
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
No differences found