projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 812666c) | patch
git-pull-script: do automatic merges
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Tue, 26 Apr 2005 19:26:46 +0000 (12:26 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Tue, 26 Apr 2005 19:26:46 +0000 (12:26 -0700)
commit9831d8f86095edde393e495d7a55cab9d35d5d05
tree98315fcaee23937a7c6ae9c84d3449d6985738b4tree | snapshot
parent812666c8e66a21e668c0789d0422aa5a7db54961commit | diff
git-pull-script: do automatic merges

When the trivial "read-tree" merge fails, fall back on the (equally
trivial) automatic merge script instead of forcing the user to do
it by hand.

When _that_ fails, you get to do a manual merge.
git-pull-script diff | blob | history
The core git plumbing