![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | |
| Sun, 22 May 2005 18:03:24 +0000 (11:03 -0700) | ||
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | |
| Sun, 22 May 2005 18:03:24 +0000 (11:03 -0700) | ||
| commit | 7ef76925d9c19ef74874e1735e2436e56d0c4897 | |
| tree | 0f31a7ea7b6e6b37e7e25d1fdb843172ef246b84 | tree | snapshot |
| parent | 6b14d7faf0bad026a81a27bac07b47691f621b8f | commit | diff |
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.
This allows you to just fetch stuff first, inspect it, and then
resolve the merge separately if everything looks good.
| Makefile | diff | blob | history | |
| git-fetch-script | [new file with mode: 0755] | blob |
| git-pull-script | diff | blob | history |