diff options
| author |  Junio C Hamano <junio@hera.kernel.org> | 2005-10-20 17:06:15 -0700 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2005-10-20 17:06:15 -0700 |
| commit | bfadbeddd1b54af8ab08a6c556c43c756ec85588 (patch) | |
| tree | 50f9bed9a78e1f51178ebf6be3cd9c20b2ffcb0b /git-merge.sh | |
| parent | Do not ask for objects known to be complete. (diff) | |
| parent | Make sure we barf on ref^{type} failure. (diff) | |
| download | tgif-bfadbeddd1b54af8ab08a6c556c43c756ec85588.tar.xz | |
Merge /pub/scm/git/git to recover lost side branch
Sorry for the mistake of rewinding something already pushed out.
This recovers the side branch lost by that mistake, specifically
ea5a65a59916503d2a14369c46b1023384d51645 commit.
Signed-off-by: Junio C Hamano <junio@hera.kernel.org>
Diffstat (limited to 'git-merge.sh')
0 files changed, 0 insertions, 0 deletions