summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2014-04-03Merge branch 'rr/doc-merge-strategies' into maintLibravatar Junio C Hamano1-2/+2
2014-04-03Merge branch 'jk/shallow-update-fix' into maintLibravatar Junio C Hamano5-56/+49
2014-04-03Merge branch 'jc/stash-pop-not-popped' into maintLibravatar Junio C Hamano1-2/+8
2014-04-03Merge branch 'jn/wt-status' into maintLibravatar Junio C Hamano3-55/+88
2014-03-18Git 1.9.1Libravatar Junio C Hamano4-3/+63
2014-03-18Merge branch 'jk/clean-d-pathspec' into maintLibravatar Junio C Hamano2-11/+25
2014-03-18Merge branch 'da/difftool-git-files' into maintLibravatar Junio C Hamano2-16/+16
2014-03-18Merge branch 'jk/remote-pushremote-config-reading' into maintLibravatar Junio C Hamano2-1/+19
2014-03-18Merge branch 'jk/commit-dates-parsing-fix' into maintLibravatar Junio C Hamano6-11/+96
2014-03-18Merge branch 'tr/diff-submodule-no-reuse-worktree' into maintLibravatar Junio C Hamano2-3/+32
2014-03-18Merge branch 'nd/reset-setup-worktree' into maintLibravatar Junio C Hamano2-3/+15
2014-03-18Merge branch 'jc/check-attr-honor-working-tree' into maintLibravatar Junio C Hamano2-22/+43
2014-03-18Merge branch 'bk/refresh-missing-ok-in-merge-recursive' into maintLibravatar Junio C Hamano4-14/+70
2014-03-18Merge branch 'ds/rev-parse-required-args' into maintLibravatar Junio C Hamano1-6/+11
2014-03-18Merge branch 'jk/config-path-include-fix' into maintLibravatar Junio C Hamano2-2/+6
2014-03-18Merge branch 'nd/diff-quiet-stat-dirty' into maintLibravatar Junio C Hamano3-24/+51
2014-03-18Merge branch 'nd/http-fetch-shallow-fix' into maintLibravatar Junio C Hamano12-37/+105
2014-03-18Merge branch 'nd/submodule-pathspec-ending-with-slash' into maintLibravatar Junio C Hamano22-76/+89
2014-03-17Documentation/merge-strategies: avoid hyphenated commandsLibravatar Ramkumar Ramachandra1-2/+2
2014-03-17shallow: verify shallow file after taking lockLibravatar Jeff King1-2/+2
2014-03-12wt-status: lift the artificual "at least 20 columns" floorLibravatar Junio C Hamano3-15/+13
2014-03-12wt-status: i18n of section labelsLibravatar Jonathan Nieder1-19/+47
2014-03-12wt-status: extract the code to compute width for labelsLibravatar Jonathan Nieder1-7/+15
2014-03-12wt-status: make full label string to be subject to l10nLibravatar Junio C Hamano1-18/+17
2014-03-11clean: simplify dir/not-dir logicLibravatar Jeff King1-9/+6
2014-03-11clean: respect pathspecs with "-d"Libravatar Jeff King2-2/+19
2014-03-07show_ident_date: fix tz range checkLibravatar Jeff King1-2/+2
2014-03-05t7800: add a difftool test for .git-filesLibravatar Junio C Hamano1-0/+14
2014-03-05i18n: proposed command missing leading dashLibravatar Sandy Carter1-2/+2
2014-02-27shallow: automatically clean up shallow tempfilesLibravatar Jeff King5-37/+40
2014-02-27shallow: use stat_validity to check for up-to-date fileLibravatar Jeff King1-17/+7
2014-02-26stash pop: mention we did not drop the stash upon failing to applyLibravatar Junio C Hamano1-2/+8
2014-02-24diff: do not quit early on stat-dirty filesLibravatar Nguyễn Thái Ngọc Duy3-5/+25
2014-02-24diff.c: move diffcore_skip_stat_unmatch core logic out for reuse laterLibravatar Nguyễn Thái Ngọc Duy1-21/+28
2014-02-24clean: use cache_name_is_other()Libravatar Nguyễn Thái Ngọc Duy1-19/+2
2014-02-24clean: replace match_pathspec() with dir_path_match()Libravatar Nguyễn Thái Ngọc Duy1-2/+1
2014-02-24pathspec: pass directory indicator to match_pathspec_item()Libravatar Nguyễn Thái Ngọc Duy6-9/+20
2014-02-24match_pathspec: match pathspec "foo/" against directory "foo"Libravatar Nguyễn Thái Ngọc Duy1-1/+6
2014-02-24dir.c: prepare match_pathspec_item for taking more flagsLibravatar Nguyễn Thái Ngọc Duy1-6/+13
2014-02-24pathspec: rename match_pathspec_depth() to match_pathspec()Libravatar Nguyễn Thái Ngọc Duy7-25/+27
2014-02-24pathspec: convert some match_pathspec_depth() to dir_path_match()Libravatar Nguyễn Thái Ngọc Duy5-8/+12
2014-02-24pathspec: convert some match_pathspec_depth() to ce_path_match()Libravatar Nguyễn Thái Ngọc Duy14-22/+24
2014-02-24merge-recursive.c: tolerate missing files while refreshing indexLibravatar Brad King2-2/+3
2014-02-24read-cache.c: extend make_cache_entry refresh flag with optionsLibravatar Brad King3-12/+16
2014-02-24read-cache.c: refactor --ignore-missing implementationLibravatar Brad King2-3/+7
2014-02-24t3030-merge-recursive: test known breakage with empty work treeLibravatar Brad King1-0/+47
2014-02-24remote: handle pushremote config in any orderLibravatar Jeff King2-1/+19
2014-02-24log: do not segfault on gmtime errorsLibravatar Jeff King2-2/+12
2014-02-24log: handle integer overflow in timestampsLibravatar Jeff King2-2/+24
2014-02-24date: check date overflow against time_tLibravatar Jeff King3-1/+19