summaryrefslogtreecommitdiff
path: root/git-merge-ours.sh
diff options
context:
space:
mode:
authorLibravatar Johannes Schindelin <Johannes.Schindelin@gmx.de>2006-07-24 14:10:45 +0200
committerLibravatar Junio C Hamano <junkio@cox.net>2006-07-25 14:15:46 -0700
commit4ab243a944a6013d9e862adadd6fe6152c842401 (patch)
tree526db06bb82543a777504d264f3e5f049369e00e /git-merge-ours.sh
parentcvsserver: avoid warning about active db handles (diff)
downloadtgif-4ab243a944a6013d9e862adadd6fe6152c842401.tar.xz
Allow an alias to start with "-p"
Now, something like [alias] pd = -p diff works as expected. [jc: a follow-up fix from Jeff King folded in.] Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge-ours.sh')
0 files changed, 0 insertions, 0 deletions