projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 0ff5bf7) | patch
Update git-merge-one-file-script.
authorJunio C Hamano <junkio@cox.net>
Mon, 2 May 2005 06:53:32 +0000 (23:53 -0700)
committerJunio C Hamano <junkio@cox.net>
Mon, 2 May 2005 06:53:32 +0000 (23:53 -0700)
commitee28152d03f2cf4b5e3ebc25f7f03f9654d3aa0d
treee07f35d350958651d7e76eea5117cca99341f3a4tree | snapshot
parent0ff5bf7cfcb20a6c2404fe7b9cc6ff18e47db812commit | diff
Update git-merge-one-file-script.

With this change, git-merge-one-file-script ceases to smudge
files in the work tree when recording the trivial merge results
(conflicting auto-merge failure case does not touch the work
tree file as before).

Signed-off-by: Junio C Hamano <junkio@cox.net>
git-merge-one-file-script diff | blob | history
The core git plumbing