Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'jk/credential-quit' | Junio C Hamano | 2014-12-22 |
|\ | |||
| * | credential: let helpers tell us to quit | Jeff King | 2014-12-04 |
* | | Merge branch 'nd/ls-tree-pathspec' | Junio C Hamano | 2014-12-22 |
|\ \ | |||
| * | | t3102: style modernization | Junio C Hamano | 2014-12-01 |
| * | | t3102: document that ls-tree does not yet support negated pathspec | Junio C Hamano | 2014-12-01 |
| * | | ls-tree: remove path filtering logic in show_tree | Nguyễn Thái Ngọc Duy | 2014-12-01 |
* | | | Merge branch 'rj/t0050-passes' | Junio C Hamano | 2014-12-22 |
|\ \ \ | |||
| * | | | t0050-*.sh: mark the rename (case change) test as passing | Ramsay Jones | 2014-11-30 |
* | | | | Merge branch 'js/push-to-deploy' | Junio C Hamano | 2014-12-22 |
|\ \ \ \ | |||
| * | | | | t5516: more tests for receive.denyCurrentBranch=updateInstead | Junio C Hamano | 2014-11-30 |
| * | | | | receive-pack: add another option for receive.denyCurrentBranch | Johannes Schindelin | 2014-11-30 |
* | | | | | Merge branch 'pb/send-email-te' | Junio C Hamano | 2014-12-22 |
|\ \ \ \ \ | |||
| * | | | | | git-send-email: add --transfer-encoding option | Paolo Bonzini | 2014-11-25 |
| | |_|/ / | |/| | | | |||
* | | | | | Merge branch 'pb/am-message-id-footer' | Junio C Hamano | 2014-12-22 |
|\ \ \ \ \ | |||
| * | | | | | git-am: add --message-id/--no-message-id | Paolo Bonzini | 2014-11-25 |
| * | | | | | git-mailinfo: add --message-id | Paolo Bonzini | 2014-11-25 |
| |/ / / / | |||
* | | | | | Merge branch 'js/t5000-dont-copy-bin-sh' | Junio C Hamano | 2014-12-22 |
|\ \ \ \ \ | |||
| * | | | | | t5000 on Windows: do not mistake "sh.exe" as "sh" | Johannes Sixt | 2014-11-24 |
| | |_|_|/ | |/| | | | |||
* | | | | | Merge branch 'jc/refer-to-t-readme-from-submitting-patches' | Junio C Hamano | 2014-12-22 |
|\ \ \ \ \ | |||
| * | | | | | t/README: justify why "! grep foo" is sufficient | Junio C Hamano | 2014-11-24 |
* | | | | | | Merge branch 'mg/add-ignore-errors' | Junio C Hamano | 2014-12-22 |
|\ \ \ \ \ \ | |||
| * | | | | | | add: ignore only ignored files | Michael J Gruber | 2014-11-21 |
| | |_|/ / / | |/| | | | | |||
* | | | | | | Merge branch 'cc/interpret-trailers-more' | Junio C Hamano | 2014-12-22 |
|\ \ \ \ \ \ | |||
| * | | | | | | trailer: add test with an old style conflict block | Christian Couder | 2014-11-10 |
| * | | | | | | trailer: reuse ignore_non_trailer() to ignore conflict lines | Christian Couder | 2014-11-10 |
| * | | | | | | Merge branch 'jc/conflict-hint' into cc/interpret-trailers-more | Junio C Hamano | 2014-11-10 |
| |\ \ \ \ \ \ | |||
| | * | | | | | | merge & sequencer: turn "Conflicts:" hint into a comment | Junio C Hamano | 2014-10-28 |
| | | |/ / / / | | |/| | | | | |||
* | | | | | | | 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 |
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | | |