summaryrefslogtreecommitdiff
path: root/git-merge-ours.sh
diff options
context:
space:
mode:
authorLibravatar Eric Wong <normalperson@yhbt.net>2007-02-14 19:34:56 -0800
committerLibravatar Eric Wong <normalperson@yhbt.net>2007-02-23 00:57:13 -0800
commita836a0e1729d1758b4085cd07fc79cb9acb64908 (patch)
tree69b24afd6ce152ed06b71e18fedb97bc96a34ef2 /git-merge-ours.sh
parentgit-svn: allow dcommit for those who only fetch from SVM with useSvmProps (diff)
downloadtgif-a836a0e1729d1758b4085cd07fc79cb9acb64908.tar.xz
git-svn: documentation updates for new functionality
Force the showing of the --minimize flag as an option in the 'migrate' help. Also, fix the usage function to correctly filter out the deprecated aliases. Signed-off-by: Eric Wong <normalperson@yhbt.net>
Diffstat (limited to 'git-merge-ours.sh')
0 files changed, 0 insertions, 0 deletions