diff options
| author |  Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-22 11:03:24 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-22 11:03:24 -0700 |
| commit | 7ef76925d9c19ef74874e1735e2436e56d0c4897 (patch) | |
| tree | 0f31a7ea7b6e6b37e7e25d1fdb843172ef246b84 /delta.h | |
| parent | [PATCH] Diffcore updates. (diff) | |
| download | tgif-7ef76925d9c19ef74874e1735e2436e56d0c4897.tar.xz | |
Split up git-pull-script into separate "fetch" and "merge" phases.
This allows you to just fetch stuff first, inspect it, and then
resolve the merge separately if everything looks good.
Diffstat (limited to 'delta.h')
0 files changed, 0 insertions, 0 deletions