diff options
| author |  Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2006-12-22 03:20:55 +0100 |
|---|---|---|
| committer |  Junio C Hamano <junkio@cox.net> | 2006-12-21 20:33:06 -0800 |
| commit | caba139d432c420f853c352987cf29cefafc2b84 (patch) | |
| tree | 1ab9894fc65dfd5b44679d0c8c2207d10b4abc50 /git-am.sh | |
| parent | Documentation/git-branch: new -r to delete remote-tracking branches. (diff) | |
| download | tgif-caba139d432c420f853c352987cf29cefafc2b84.tar.xz | |
Use git-merge-file in git-merge-one-file, too
Would you believe? I edited git-merge-one-file (note the missing ".sh"!)
when I submitted the patch which became commit e2b7008752...
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-am.sh')
0 files changed, 0 insertions, 0 deletions