summaryrefslogtreecommitdiff
path: root/show-branch.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2006-05-20 01:28:49 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2006-05-20 01:52:19 -0700
commit93872e07008510340eec951f0d037f7b3a0b8567 (patch)
treece5b2c6456000dd5e8dde7b479c2ad6784966055 /show-branch.c
parentMerge branch 'jc/cache-tree' into jc/dirwalk-n-cache-tree (diff)
parentAdd builtin "git rm" command (diff)
downloadtgif-93872e07008510340eec951f0d037f7b3a0b8567.tar.xz
Merge branch 'lt/dirwalk' into jc/dirwalk-n-cache-tree
This commit is what this branch is all about. It records the evil merge needed to adjust built-in git-add and git-rm for the cache-tree extension. * lt/dirwalk: Add builtin "git rm" command Move pathspec matching from builtin-add.c into dir.c Prevent bogus paths from being added to the index. builtin-add: fix unmatched pathspec warnings. Remove old "git-add.sh" remnants builtin-add: warn on unmatched pathspecs Do "git add" as a builtin Clean up git-ls-file directory walking library interface libify git-ls-files directory traversal Conflicts: Makefile builtin.h git.c update-index.c
Diffstat (limited to 'show-branch.c')
0 files changed, 0 insertions, 0 deletions