Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Sync with v2.2.1 | Junio C Hamano | 2014-12-18 |
|\ | |||
| * | Sync with v2.1.4 | Junio C Hamano | 2014-12-17 |
| |\ | |||
| | * | Sync with v2.0.5 | Junio C Hamano | 2014-12-17 |
| | |\ | |||
| | | * | Sync with v1.9.5 | Junio C Hamano | 2014-12-17 |
| | | |\ | |||
| | | | * | Sync with v1.8.5.6 | Junio C Hamano | 2014-12-17 |
| | | | |\ | |||
| | | | | * | Merge branch 'dotgit-case-maint-1.8.5' into maint-1.8.5 | Junio C Hamano | 2014-12-17 |
| | | | | |\ | |||
| | | | | | * | fsck: complain about NTFS ".git" aliases in trees | Johannes Schindelin | 2014-12-17 |
| | | | | | * | read-cache: optionally disallow NTFS .git variants | Johannes Schindelin | 2014-12-17 |
| | | | | | * | fsck: complain about HFS+ ".git" aliases in trees | Jeff King | 2014-12-17 |
| | | | | | * | read-cache: optionally disallow HFS+ .git variants | Jeff King | 2014-12-17 |
| | | | | | * | fsck: notice .git case-insensitively | Jeff King | 2014-12-17 |
| | | | | | * | t1450: refactor ".", "..", and ".git" fsck tests | Jeff King | 2014-12-17 |
| | | | | | * | verify_dotfile(): reject .git case-insensitively | Jeff King | 2014-12-17 |
| | | | | | * | read-tree: add tests for confusing paths like ".." and ".git" | Jeff King | 2014-12-17 |
* | | | | | | | Merge branch 'jk/push-simple' | Junio C Hamano | 2014-12-12 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | push: truly use "simple" as default, not "upstream" | Jeff King | 2014-11-30 |
* | | | | | | | | Merge branch 'jk/colors-fix' | Junio C Hamano | 2014-12-12 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | t4026: test "normal" color | Jeff King | 2014-11-20 |
| | |_|/ / / / / | |/| | | | | | | |||
* | | | | | | | | Merge branch 'jk/no-perl-tests' | Junio C Hamano | 2014-12-12 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | t960[34]: mark cvsimport tests as requiring perl | Jeff King | 2014-11-18 |
| * | | | | | | | | t0090: mark add-interactive test with PERL prerequisite | Jeff King | 2014-11-18 |
* | | | | | | | | | Merge branch 'mh/config-flip-xbit-back-after-checking' | Junio C Hamano | 2014-12-05 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | create_default_files(): don't set u+x bit on $GIT_DIR/config | Michael Haggerty | 2014-11-18 |
| | |_|_|_|/ / / / | |/| | | | | | | | |||
* | | | | | | | | | Merge branch 'jh/empty-notes' | Junio C Hamano | 2014-12-05 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | t3301: modernize style | Johan Herland | 2014-11-14 |
| * | | | | | | | | | notes: empty notes should be shown by 'git log' | Johan Herland | 2014-11-12 |
| * | | | | | | | | | builtin/notes: add --allow-empty, to allow storing empty notes | Johan Herland | 2014-11-12 |
| * | | | | | | | | | t3301: verify that 'git notes' removes empty notes by default | Johan Herland | 2014-11-10 |
* | | | | | | | | | | Merge branch 'jk/checkout-from-tree' | Junio C Hamano | 2014-12-05 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | | | |||
| * | | | | | | | | | checkout $tree: do not throw away unchanged index entries | Jeff King | 2014-11-13 |
| | |_|_|_|_|_|/ / | |/| | | | | | | | |||
* | | | | | | | | | Merge branch 'tb/no-relative-file-url' | Junio C Hamano | 2014-11-19 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | t5705: the file:// URL should be absolute | Torsten Bögershausen | 2014-11-13 |
| | |_|_|_|/ / / / | |/| | | | | | | | |||
| * | | | | | | | | Merge branch 'jk/pack-objects-no-bitmap-when-splitting' into maint | Junio C Hamano | 2014-10-29 |
| |\ \ \ \ \ \ \ \ | |||
* | \ \ \ \ \ \ \ \ | Merge branch 'da/difftool' | Junio C Hamano | 2014-11-18 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | | | |||
| * | | | | | | | | | difftool: honor --trust-exit-code for builtin tools | David Aguilar | 2014-11-14 |
* | | | | | | | | | | Merge branch 'jk/fetch-reflog-df-conflict' | Junio C Hamano | 2014-11-12 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | | |||
| * | | | | | | | | | t1410: fix breakage on case-insensitive filesystems | Jeff King | 2014-11-10 |
* | | | | | | | | | | Merge branch 'tm/line-log-first-parent' | Junio C Hamano | 2014-11-06 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | line-log: fix crash when --first-parent is used | Tzvetan Mikov | 2014-11-04 |
* | | | | | | | | | | | Merge branch 'jk/fetch-reflog-df-conflict' | Junio C Hamano | 2014-11-06 |
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | |||
| * | | | | | | | | | | ignore stale directories when checking reflog existence | Jeff King | 2014-11-04 |
| * | | | | | | | | | | fetch: load all default config at startup | Jeff King | 2014-11-04 |
| | |_|_|_|_|/ / / / | |/| | | | | | | | | |||
* | | | | | | | | | | Merge branch 'rs/grep-color-words' | Junio C Hamano | 2014-10-31 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | grep: add color.grep.matchcontext and color.grep.matchselected | René Scharfe | 2014-10-28 |
| | |_|_|_|_|/ / / / | |/| | | | | | | | | |||
* | | | | | | | | | | Merge branch 'da/difftool' | Junio C Hamano | 2014-10-29 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | |||
| * | | | | | | | | | difftool: add support for --trust-exit-code | David Aguilar | 2014-10-28 |
| * | | | | | | | | | difftool--helper: exit when reading a prompt answer fails | Johannes Sixt | 2014-10-27 |
| | |_|_|/ / / / / | |/| | | | | | | | |||
| * | | | | | | | | Merge branch 'jk/mbox-from-line' into maint | Junio C Hamano | 2014-10-07 |
| |\ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ | Merge branch 'jk/fsck-exit-code-fix' into maint | Junio C Hamano | 2014-09-29 |
| |\ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'ta/config-add-to-empty-or-true-fix' into maint | Junio C Hamano | 2014-09-29 |
| |\ \ \ \ \ \ \ \ \ \ |