summaryrefslogtreecommitdiff
path: root/git-merge.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-02-11 20:34:57 -0800
committerJunio C Hamano <junkio@cox.net>2007-02-11 20:34:57 -0800
commitb578e509d3d346513efda14606886a55174e5181 (patch)
tree3019a31dcc68a665620ecdb6fc8544d294d2a87f /git-merge.sh
parentd4144612958c255d273ad1bd1fe33f03c0f67ada (diff)
parentc6ec3b13b81d59272e41d5316689c65dd4cc2e63 (diff)
downloadgit-b578e509d3d346513efda14606886a55174e5181.tar.gz
Merge branch 'master' of git://repo.or.cz/git/fastimport
* 'master' of git://repo.or.cz/git/fastimport: bash: Hide git-fast-import. fast-import: Add tip about importing renames. fast-import: Hide the pack boundary commits by default.
Diffstat (limited to 'git-merge.sh')
0 files changed, 0 insertions, 0 deletions