Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'maint-1.9' into maint-2.0 | Junio C Hamano | 2015-01-07 |
|\ | |||
| * | Merge branch 'maint-1.8.5' into maint-1.9 | Junio C Hamano | 2015-01-07 |
| |\ | |||
| | * | Merge branch 'jk/dotgit-case-maint-1.8.5' into maint-1.8.5 | Junio C Hamano | 2015-01-07 |
| | |\ | |||
| | | * | is_hfs_dotgit: loosen over-eager match of \u{..47} | Jeff King | 2014-12-29 |
* | | | | 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 'maint-1.8.5' into maint-1.9 | Junio C Hamano | 2014-07-16 |
| |\ \ \ | | |/ / | |||
* | | | | commit --amend: test specifies authorship but forgets to check | Fabian Ruch | 2014-07-30 |
* | | | | t4013: test diff-tree's --stdin commit formatting | Jeff King | 2014-07-28 |
* | | | | Merge branch 'zk/log-graph-showsig' into maint | Junio C Hamano | 2014-07-22 |
|\ \ \ \ | |||
| * | | | | log: fix indentation for --graph --show-signature | Zoltan Klinger | 2014-07-09 |
| | |/ / | |/| | | |||
* | | | | Merge branch 'cb/filter-branch-prune-empty-degenerate-merges' into maint | Junio C Hamano | 2014-07-22 |
|\ \ \ \ | |||
| * | | | | filter-branch: eliminate duplicate mapped parents | Charles Bailey | 2014-07-01 |
* | | | | | Merge branch 'jm/dedup-test-config' into maint | Junio C Hamano | 2014-07-22 |
|\ \ \ \ \ | |||
| * | | | | | t/t7810-grep.sh: remove duplicate test_config() | Jeremiah Mahler | 2014-06-05 |
* | | | | | | Merge branch 'sk/test-cmp-bin' into maint | Junio C Hamano | 2014-07-22 |
|\ \ \ \ \ \ | |||
| * | | | | | | t5000, t5003: do not use test_cmp to compare binary files | Stepan Kasal | 2014-06-04 |
* | | | | | | | Merge branch 'lt/request-pull' into maint | Junio C Hamano | 2014-07-22 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | fix brown paper bag breakage in t5150-request-pull.sh | Johannes Sixt | 2014-06-02 |
* | | | | | | | | Merge branch 'ep/shell-assign-and-export-vars' into maint | Junio C Hamano | 2014-07-22 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | scripts: more "export VAR=VALUE" fixes | Junio C Hamano | 2014-05-23 |
* | | | | | | | | | Merge branch 'jk/pretty-G-format-fixes' into maint | Junio C Hamano | 2014-07-16 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | move "%G" format test from t7510 to t6006 | Jeff King | 2014-06-25 |
| * | | | | | | | | | pretty: avoid reading past end-of-string with "%G" | Jeff King | 2014-06-17 |
| * | | | | | | | | | t7510: check %G* pretty-format output | Jeff King | 2014-06-17 |
| * | | | | | | | | | t7510: test a commit signed by an unknown key | Jeff King | 2014-06-17 |
| * | | | | | | | | | t7510: use consistent &&-chains in loop | Michael J Gruber | 2014-06-17 |
| * | | | | | | | | | t7510: stop referring to master in later tests | Jeff King | 2014-06-17 |
* | | | | | | | | | | Merge branch 'bc/fix-rebase-merge-skip' into maint | Junio C Hamano | 2014-07-16 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | rebase--merge: fix --skip with two conflicts in a row | brian m. carlson | 2014-06-16 |
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | |||
| * | | | | | | | | | Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname' into maint | Junio C Hamano | 2014-05-28 |
| |\ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'mw/symlinks' into maint | Junio C Hamano | 2014-05-28 |
| |\ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname' into maint | Junio C Hamano | 2014-05-08 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'km/avoid-bs-in-shell-glob' into maint | Junio C Hamano | 2014-05-08 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'km/avoid-cp-a' into maint | Junio C Hamano | 2014-05-08 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'pb/trim-trailing-spaces' into maint | Junio C Hamano | 2014-07-10 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | t0008: do not depend on 'echo' handling backslashes specially | Junio C Hamano | 2014-06-13 |
| * | | | | | | | | | | | | | | | dir.c:trim_trailing_spaces(): fix for " \ " sequence | Pasha Bolokhov | 2014-06-02 |
| | |_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | |||
* | | | | | | | | | | | | | | | Merge branch 'jk/repack-pack-keep-objects' into maint | Junio C Hamano | 2014-07-10 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | repack: respect pack.writebitmaps | Jeff King | 2014-06-10 |
| * | | | | | | | | | | | | | | | repack: do not accidentally pack kept objects by default | Jeff King | 2014-06-10 |