Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'mg/add-ignore-errors' into maint | Junio C Hamano | 2015-01-12 | 1 | -1/+7 |
|\ | |||||
| * | add: ignore only ignored filesmg/add-ignore-errors | Michael J Gruber | 2014-11-21 | 1 | -1/+7 |
* | | Merge branch 'jk/approxidate-avoid-y-d-m-over-future-dates' into maint | Junio C Hamano | 2015-01-12 | 1 | -0/+3 |
|\ \ | |||||
| * | | approxidate: allow ISO-like dates far in the futurejk/approxidate-avoid-y-d-m-over-future-dates | Jeff King | 2014-11-13 | 1 | -0/+3 |
* | | | Merge branch 'jk/for-each-reflog-ent-reverse' into maint | Junio C Hamano | 2015-01-12 | 1 | -0/+30 |
|\ \ \ | |||||
| * | | | for_each_reflog_ent_reverse: fix newlines on block boundaries | Jeff King | 2014-12-05 | 1 | -0/+30 |
* | | | | Merge branch 'maint-2.1' into maint | Junio C Hamano | 2015-01-07 | 1 | -0/+15 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'maint-2.0' into maint-2.1maint-2.1 | Junio C Hamano | 2015-01-07 | 1 | -0/+15 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge branch 'maint-1.9' into maint-2.0maint-2.0 | Junio C Hamano | 2015-01-07 | 1 | -0/+15 |
| | |\ \ \ \ | |||||
| | | * \ \ \ | Merge branch 'maint-1.8.5' into maint-1.9maint-1.9 | Junio C Hamano | 2015-01-07 | 1 | -0/+15 |
| | | |\ \ \ \ | |||||
| | | | * \ \ \ | Merge branch 'jk/dotgit-case-maint-1.8.5' into maint-1.8.5maint-1.8.5 | Junio C Hamano | 2015-01-07 | 1 | -0/+15 |
| | | | |\ \ \ \ | |||||
| | | | | * | | | | is_hfs_dotgit: loosen over-eager match of \u{..47}jk/dotgit-case-maint-1.8.5dotgit-case-maint-1.8.5 | Jeff King | 2014-12-29 | 1 | -0/+15 |
* | | | | | | | | | Merge branch 'jk/no-perl-tests' into maint | Junio C Hamano | 2014-12-22 | 3 | -4/+4 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | t960[34]: mark cvsimport tests as requiring perljk/no-perl-tests | Jeff King | 2014-11-18 | 2 | -3/+3 |
| * | | | | | | | | | t0090: mark add-interactive test with PERL prerequisite | Jeff King | 2014-11-18 | 1 | -1/+1 |
* | | | | | | | | | | Merge branch 'jk/push-simple' into maint | Junio C Hamano | 2014-12-22 | 1 | -2/+30 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | push: truly use "simple" as default, not "upstream"jk/push-simple | Jeff King | 2014-11-30 | 1 | -2/+30 |
* | | | | | | | | | | | Merge branch 'mh/config-flip-xbit-back-after-checking' into maint | Junio C Hamano | 2014-12-22 | 1 | -0/+7 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | create_default_files(): don't set u+x bit on $GIT_DIR/configmh/config-flip-xbit-back-after-checking | Michael Haggerty | 2014-11-18 | 1 | -0/+7 |
* | | | | | | | | | | | | Merge branch 'jk/colors-fix' into maint | Junio C Hamano | 2014-12-22 | 1 | -0/+8 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | t4026: test "normal" colorjk/colors-fix | Jeff King | 2014-11-20 | 1 | -0/+8 |
* | | | | | | | | | | | | | Merge branch 'jk/checkout-from-tree' into maint | Junio C Hamano | 2014-12-22 | 1 | -0/+17 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | checkout $tree: do not throw away unchanged index entriesjk/checkout-from-tree | Jeff King | 2014-11-13 | 1 | -0/+17 |
| | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Sync with v2.1.4 | Junio C Hamano | 2014-12-17 | 3 | -31/+102 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | Sync with v2.0.5 | Junio C Hamano | 2014-12-17 | 3 | -31/+102 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | / / / / / | | | |_|_|_|/ / / / / | | |/| | | | | | | | | |||||
| | * | | | | | | | | | Sync with v1.9.5 | Junio C Hamano | 2014-12-17 | 3 | -31/+102 |
| | |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | / / / / | | | | |_|_|/ / / / | | | |/| | | | | | | |||||
| | | * | | | | | | | Sync with v1.8.5.6 | Junio C Hamano | 2014-12-17 | 3 | -31/+102 |
| | | |\ \ \ \ \ \ \ | | | | | |_|_|/ / / | | | | |/| | | | | | |||||
| | | | * | | | | | | Merge branch 'dotgit-case-maint-1.8.5' into maint-1.8.5 | Junio C Hamano | 2014-12-17 | 3 | -31/+102 |
| | | | |\ \ \ \ \ \ | | | | | |/ / / / / | | | | |/| | | / / | | | | | | |_|/ / | | | | | |/| | | | |||||
| | | | | * | | | | fsck: complain about NTFS ".git" aliases in trees | Johannes Schindelin | 2014-12-17 | 1 | -2/+7 |
| | | | | * | | | | read-cache: optionally disallow NTFS .git variants | Johannes Schindelin | 2014-12-17 | 1 | -0/+13 |
| | | | | * | | | | fsck: complain about HFS+ ".git" aliases in trees | Jeff King | 2014-12-17 | 1 | -3/+5 |
| | | | | * | | | | read-cache: optionally disallow HFS+ .git variants | Jeff King | 2014-12-17 | 2 | -5/+25 |
| | | | | * | | | | fsck: notice .git case-insensitively | Jeff King | 2014-12-17 | 1 | -0/+1 |
| | | | | * | | | | t1450: refactor ".", "..", and ".git" fsck tests | Jeff King | 2014-12-17 | 1 | -30/+27 |
| | | | | * | | | | verify_dotfile(): reject .git case-insensitively | Jeff King | 2014-12-17 | 1 | -0/+1 |
| | | | | * | | | | read-tree: add tests for confusing paths like ".." and ".git" | Jeff King | 2014-12-17 | 1 | -0/+32 |
* | | | | | | | | | Merge branch 'tb/no-relative-file-url' | Junio C Hamano | 2014-11-19 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | t5705: the file:// URL should be absolutetb/no-relative-file-url | Torsten Bögershausen | 2014-11-13 | 1 | -1/+1 |
| |/ / / / / / / / | |||||
| * | | | | | | | | Merge branch 'jk/pack-objects-no-bitmap-when-splitting' into maint | Junio C Hamano | 2014-10-29 | 1 | -0/+9 |
| |\ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ | Merge branch 'da/difftool' | Junio C Hamano | 2014-11-18 | 1 | -0/+5 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |||||
| * | | | | | | | | | difftool: honor --trust-exit-code for builtin tools | David Aguilar | 2014-11-14 | 1 | -0/+5 |
* | | | | | | | | | | Merge branch 'jk/fetch-reflog-df-conflict' | Junio C Hamano | 2014-11-12 | 1 | -18/+18 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | t1410: fix breakage on case-insensitive filesystemsjk/fetch-reflog-df-conflict | Jeff King | 2014-11-10 | 1 | -18/+18 |
* | | | | | | | | | | | Merge branch 'tm/line-log-first-parent' | Junio C Hamano | 2014-11-06 | 1 | -0/+5 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | line-log: fix crash when --first-parent is usedtm/line-log-first-parent | Tzvetan Mikov | 2014-11-04 | 1 | -0/+5 |
* | | | | | | | | | | | | Merge branch 'jk/fetch-reflog-df-conflict' | Junio C Hamano | 2014-11-06 | 2 | -0/+74 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | ignore stale directories when checking reflog existence | Jeff King | 2014-11-04 | 1 | -0/+34 |
| * | | | | | | | | | | | fetch: load all default config at startup | Jeff King | 2014-11-04 | 1 | -0/+40 |
| | |_|_|_|/ / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'rs/grep-color-words' | Junio C Hamano | 2014-10-31 | 1 | -0/+94 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | grep: add color.grep.matchcontext and color.grep.matchselectedrs/grep-color-words | René Scharfe | 2014-10-28 | 1 | -0/+94 |
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | | |