]> asedeno.scripts.mit.edu Git - git.git/commitdiff
Merge branch 'jc/setup'
authorJunio C Hamano <gitster@pobox.com>
Thu, 21 Feb 2008 00:13:16 +0000 (16:13 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 21 Feb 2008 00:13:16 +0000 (16:13 -0800)
* jc/setup:
  builtin-mv: minimum fix to avoid losing files
  git-add: adjust to the get_pathspec() changes.
  Make blame accept absolute paths
  setup: sanitize absolute and funny paths in get_pathspec()

1  2 
builtin-blame.c
builtin-ls-files.c
setup.c

diff --cc builtin-blame.c
Simple merge
Simple merge
diff --cc setup.c
Simple merge