| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'cc/interpret-trailers-more' | Junio C Hamano | 2014-12-22 | 9 | -72/+170 |
| |\ | |||||
| | * | trailer: add test with an old style conflict blockcc/interpret-trailers-more | Christian Couder | 2014-11-10 | 1 | -1/+31 |
| | * | trailer: reuse ignore_non_trailer() to ignore conflict lines | Christian Couder | 2014-11-10 | 2 | -7/+27 |
| | * | commit: make ignore_non_trailer() non static | Christian Couder | 2014-11-10 | 3 | -46/+49 |
| | * | Merge branch 'jc/conflict-hint' into cc/interpret-trailers-more | Junio C Hamano | 2014-11-10 | 6 | -65/+110 |
| | |\ | |||||
| | | * | merge & sequencer: turn "Conflicts:" hint into a commentjc/conflict-hint | Junio C Hamano | 2014-10-28 | 3 | -28/+68 |
| | | * | builtin/commit.c: extract ignore_non_trailer() helper function | Junio C Hamano | 2014-10-28 | 1 | -26/+33 |
| | | * | merge & sequencer: unify codepaths that write "Conflicts:" hint | Junio C Hamano | 2014-10-24 | 3 | -28/+26 |
| | | * | builtin/merge.c: drop a parameter that is never used | Junio C Hamano | 2014-10-24 | 1 | -2/+2 |
| * | | | Sync with v2.2.1 | Junio C Hamano | 2014-12-18 | 20 | -43/+442 |
| |\ \ \ | |||||
| | * | | | Git 2.2.1v2.2.1 | Junio C Hamano | 2014-12-17 | 4 | -3/+38 |
| | * | | | Sync with v2.1.4 | Junio C Hamano | 2014-12-17 | 19 | -42/+406 |
| | |\ \ \ | |||||
| | | * | | | Git 2.1.4v2.1.4 | Junio C Hamano | 2014-12-17 | 4 | -3/+38 |
| | | * | | | Sync with v2.0.5 | Junio C Hamano | 2014-12-17 | 18 | -41/+370 |
| | | |\ \ \ | |||||
| | | | * | | | Git 2.0.5v2.0.5 | Junio C Hamano | 2014-12-17 | 4 | -3/+38 |
| | | | * | | | Sync with v1.9.5 | Junio C Hamano | 2014-12-17 | 17 | -40/+334 |
| | | | |\ \ \ | |||||
| | | | | * | | | Git 1.9.5v1.9.5 | Junio C Hamano | 2014-12-17 | 4 | -3/+38 |
| | | | | * | | | Sync with v1.8.5.6 | Junio C Hamano | 2014-12-17 | 16 | -39/+297 |
| | | | | |\ \ \ | |||||
| | | | | | * | | | Git 1.8.5.6v1.8.5.6 | Junio C Hamano | 2014-12-17 | 4 | -3/+38 |
| | | | | | * | | | Merge branch 'dotgit-case-maint-1.8.5' into maint-1.8.5 | Junio C Hamano | 2014-12-17 | 14 | -38/+261 |
| | | | | | |\ \ \ | | | | | | |_|/ | | | | | |/| | | |||||
| | | | | | | * | | fsck: complain about NTFS ".git" aliases in trees | Johannes Schindelin | 2014-12-17 | 2 | -3/+9 |
| | | | | | | * | | read-cache: optionally disallow NTFS .git variants | Johannes Schindelin | 2014-12-17 | 7 | -0/+34 |
| | | | | | | * | | path: add is_ntfs_dotgit() helper | Johannes Schindelin | 2014-12-17 | 2 | -0/+34 |
| | | | | | | * | | fsck: complain about HFS+ ".git" aliases in trees | Jeff King | 2014-12-17 | 2 | -4/+7 |
| | | | | | | * | | read-cache: optionally disallow HFS+ .git variants | Jeff King | 2014-12-17 | 8 | -5/+45 |
| | | | | | | * | | utf8: add is_hfs_dotgit() helper | Jeff King | 2014-12-17 | 2 | -0/+72 |
| | | | | | | * | | fsck: notice .git case-insensitively | Jeff King | 2014-12-17 | 2 | -1/+2 |
| | | | | | | * | | 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 | 2 | -2/+4 |
| | | | | | | * | | read-tree: add tests for confusing paths like ".." and ".git" | Jeff King | 2014-12-17 | 1 | -0/+32 |
| | | | | | | * | | unpack-trees: propagate errors adding entries to the index | Jeff King | 2014-12-17 | 1 | -4/+6 |
| * | | | | | | | | Second batch for 2.3 cycle | Junio C Hamano | 2014-12-12 | 1 | -0/+18 |
| * | | | | | | | | Merge branch 'jk/pack-bitmap' | Junio C Hamano | 2014-12-12 | 4 | -18/+29 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | pack-bitmap: do not use gcc packed attribute | Karsten Blees | 2014-11-30 | 4 | -18/+29 |
| * | | | | | | | | | Merge branch 'jk/push-simple' | Junio C Hamano | 2014-12-12 | 2 | -6/+34 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | push: truly use "simple" as default, not "upstream"jk/push-simple | Jeff King | 2014-11-30 | 2 | -6/+34 |
| * | | | | | | | | | | Merge branch 'da/difftool-mergetool-simplify-reporting-status' | Junio C Hamano | 2014-12-12 | 6 | -29/+12 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | mergetools: stop setting $status in merge_cmd()da/difftool-mergetool-simplify-reporting-status | David Aguilar | 2014-11-21 | 3 | -3/+0 |
| | * | | | | | | | | | | mergetool: simplify conditionals | David Aguilar | 2014-11-21 | 1 | -11/+5 |
| | * | | | | | | | | | | difftool--helper: add explicit exit statement | David Aguilar | 2014-11-21 | 1 | -0/+2 |
| | * | | | | | | | | | | mergetool--lib: remove use of $status global | David Aguilar | 2014-11-21 | 1 | -14/+5 |
| | * | | | | | | | | | | mergetool--lib: remove no-op assignment to $status from setup_user_tool | Junio C Hamano | 2014-11-21 | 1 | -1/+0 |
| * | | | | | | | | | | | Merge branch 'jk/colors-fix' | Junio C Hamano | 2014-12-12 | 3 | -14/+25 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | t4026: test "normal" colorjk/colors-fix | Jeff King | 2014-11-20 | 1 | -0/+8 |
| | * | | | | | | | | | | | config: fix parsing of "git config --get-color some.key -1" | Jeff King | 2014-11-20 | 1 | -14/+13 |
| | * | | | | | | | | | | | docs: describe ANSI 256-color mode | Jeff King | 2014-11-20 | 1 | -0/+4 |
| | | |_|_|_|/ / / / / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | | Merge branch 'rt/push-recurse-submodule-usage-string' | Junio C Hamano | 2014-12-12 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | builtin/push.c: fix description of --recurse-submodules optionrt/push-recurse-submodule-usage-string | Ralf Thielow | 2014-11-18 | 1 | -1/+1 |
| | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | | Merge branch 'jk/rebuild-perl-scripts-with-no-perl-seting-change' | Junio C Hamano | 2014-12-12 | 1 | -4/+10 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | Makefile: have python scripts depend on NO_PYTHON settingjk/rebuild-perl-scripts-with-no-perl-seting-change | Jonathan Nieder | 2014-11-18 | 1 | -0/+3 |
 |
index : delta/git.git | |
| github.com: git/git.git |
| summaryrefslogtreecommitdiff |