Merge tag 'v1.9.1' into fc/master v1.9.1+fc1
authorFelipe Contreras <felipe.contreras@gmail.com>
Tue, 8 Apr 2014 23:21:29 +0000 (18:21 -0500)
committerFelipe Contreras <felipe.contreras@gmail.com>
Tue, 8 Apr 2014 23:21:29 +0000 (18:21 -0500)
commit5f839c698927c71ce2d49e7805c38c6fd83249fd
tree971344db43ece21bb147c7996c4783c1ab95c320
parentd6bbbdeebe107290548abda09ed9cd80392cbbc9
parentcee0c2750bb5f1b38f15ef961517e03c2e39c9ec
Merge tag 'v1.9.1' into fc/master

Git 1.9.1

* tag 'v1.9.1': (41 commits)
  Git 1.9.1
  clean: simplify dir/not-dir logic
  clean: respect pathspecs with "-d"
  show_ident_date: fix tz range check
  t7800: add a difftool test for .git-files
  i18n: proposed command missing leading dash
  diff: do not quit early on stat-dirty files
  diff.c: move diffcore_skip_stat_unmatch core logic out for reuse later
  clean: use cache_name_is_other()
  clean: replace match_pathspec() with dir_path_match()
  pathspec: pass directory indicator to match_pathspec_item()
  match_pathspec: match pathspec "foo/" against directory "foo"
  dir.c: prepare match_pathspec_item for taking more flags
  pathspec: rename match_pathspec_depth() to match_pathspec()
  pathspec: convert some match_pathspec_depth() to dir_path_match()
  pathspec: convert some match_pathspec_depth() to ce_path_match()
  merge-recursive.c: tolerate missing files while refreshing index
  read-cache.c: extend make_cache_entry refresh flag with options
  read-cache.c: refactor --ignore-missing implementation
  t3030-merge-recursive: test known breakage with empty work tree
  ...

Conflicts:
GIT-VERSION-GEN
remote.c
GIT-VERSION-GEN
builtin/add.c
builtin/grep.c
builtin/reset.c
builtin/rm.c
cache.h
config.c
remote.c