summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | init-db: improve the filemode trustability checktb/config-core-filemode-check-on-broken-fsTorsten Bögershausen2014-11-211-0/+2
* | | | | | | | | | Merge branch 'mg/add-ignore-errors'Junio C Hamano2014-12-222-2/+8
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | add: ignore only ignored filesmg/add-ignore-errorsMichael J Gruber2014-11-212-2/+8
* | | | | | | | | | | Merge branch 'jk/lock-ref-sha1-basic-return-errors'Junio C Hamano2014-12-221-2/+8
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | lock_ref_sha1_basic: do not die on locking errorsjk/lock-ref-sha1-basic-return-errorsRonnie Sahlberg2014-11-201-2/+8
| | |_|_|_|/ / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'cc/interpret-trailers-more'Junio C Hamano2014-12-229-72/+170
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | trailer: add test with an old style conflict blockcc/interpret-trailers-moreChristian Couder2014-11-101-1/+31
| * | | | | | | | | | | trailer: reuse ignore_non_trailer() to ignore conflict linesChristian Couder2014-11-102-7/+27
| * | | | | | | | | | | commit: make ignore_non_trailer() non staticChristian Couder2014-11-103-46/+49
| * | | | | | | | | | | Merge branch 'jc/conflict-hint' into cc/interpret-trailers-moreJunio C Hamano2014-11-106-65/+110
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | merge & sequencer: turn "Conflicts:" hint into a commentjc/conflict-hintJunio C Hamano2014-10-283-28/+68
| | * | | | | | | | | | | builtin/commit.c: extract ignore_non_trailer() helper functionJunio C Hamano2014-10-281-26/+33
| | * | | | | | | | | | | merge & sequencer: unify codepaths that write "Conflicts:" hintJunio C Hamano2014-10-243-28/+26
| | * | | | | | | | | | | builtin/merge.c: drop a parameter that is never usedJunio C Hamano2014-10-241-2/+2
| | | |_|_|/ / / / / / / | | |/| | | | | | | | |
* | | | | | | | | | | | Sync with v2.2.1Junio C Hamano2014-12-1820-43/+442
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Git 2.2.1v2.2.1Junio C Hamano2014-12-174-3/+38
| * | | | | | | | | | | | Sync with v2.1.4Junio C Hamano2014-12-1719-42/+406
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Git 2.1.4v2.1.4Junio C Hamano2014-12-174-3/+38
| | * | | | | | | | | | | | Sync with v2.0.5Junio C Hamano2014-12-1718-41/+370
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | Git 2.0.5v2.0.5Junio C Hamano2014-12-174-3/+38
| | | * | | | | | | | | | | Sync with v1.9.5Junio C Hamano2014-12-1717-40/+334
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | Git 1.9.5v1.9.5Junio C Hamano2014-12-174-3/+38
| | | | * | | | | | | | | | | Sync with v1.8.5.6Junio C Hamano2014-12-1716-39/+297
| | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | Git 1.8.5.6v1.8.5.6Junio C Hamano2014-12-174-3/+38
| | | | | * | | | | | | | | | | Merge branch 'dotgit-case-maint-1.8.5' into maint-1.8.5Junio C Hamano2014-12-1714-38/+261
| | | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|/ / / / / / / / / | | | | | |/| | | | | | | | | |
| | | | | | * | | | | | | | | | fsck: complain about NTFS ".git" aliases in treesJohannes Schindelin2014-12-172-3/+9
| | | | | | * | | | | | | | | | read-cache: optionally disallow NTFS .git variantsJohannes Schindelin2014-12-177-0/+34
| | | | | | * | | | | | | | | | path: add is_ntfs_dotgit() helperJohannes Schindelin2014-12-172-0/+34
| | | | | | * | | | | | | | | | fsck: complain about HFS+ ".git" aliases in treesJeff King2014-12-172-4/+7
| | | | | | * | | | | | | | | | read-cache: optionally disallow HFS+ .git variantsJeff King2014-12-178-5/+45
| | | | | | * | | | | | | | | | utf8: add is_hfs_dotgit() helperJeff King2014-12-172-0/+72
| | | | | | * | | | | | | | | | fsck: notice .git case-insensitivelyJeff King2014-12-172-1/+2
| | | | | | * | | | | | | | | | t1450: refactor ".", "..", and ".git" fsck testsJeff King2014-12-171-30/+27
| | | | | | * | | | | | | | | | verify_dotfile(): reject .git case-insensitivelyJeff King2014-12-172-2/+4
| | | | | | * | | | | | | | | | read-tree: add tests for confusing paths like ".." and ".git"Jeff King2014-12-171-0/+32
| | | | | | * | | | | | | | | | unpack-trees: propagate errors adding entries to the indexJeff King2014-12-171-4/+6
* | | | | | | | | | | | | | | | Second batch for 2.3 cycleJunio C Hamano2014-12-121-0/+18
* | | | | | | | | | | | | | | | Merge branch 'jk/pack-bitmap'Junio C Hamano2014-12-124-18/+29
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | pack-bitmap: do not use gcc packed attributeKarsten Blees2014-11-304-18/+29
* | | | | | | | | | | | | | | | | Merge branch 'jk/push-simple'Junio C Hamano2014-12-122-6/+34
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | push: truly use "simple" as default, not "upstream"jk/push-simpleJeff King2014-11-302-6/+34
* | | | | | | | | | | | | | | | | | Merge branch 'da/difftool-mergetool-simplify-reporting-status'Junio C Hamano2014-12-126-29/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | mergetools: stop setting $status in merge_cmd()da/difftool-mergetool-simplify-reporting-statusDavid Aguilar2014-11-213-3/+0
| * | | | | | | | | | | | | | | | | | mergetool: simplify conditionalsDavid Aguilar2014-11-211-11/+5
| * | | | | | | | | | | | | | | | | | difftool--helper: add explicit exit statementDavid Aguilar2014-11-211-0/+2
| * | | | | | | | | | | | | | | | | | mergetool--lib: remove use of $status globalDavid Aguilar2014-11-211-14/+5
| * | | | | | | | | | | | | | | | | | mergetool--lib: remove no-op assignment to $status from setup_user_toolJunio C Hamano2014-11-211-1/+0
* | | | | | | | | | | | | | | | | | | Merge branch 'jk/colors-fix'Junio C Hamano2014-12-123-14/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | t4026: test "normal" colorjk/colors-fixJeff King2014-11-201-0/+8
| * | | | | | | | | | | | | | | | | | | config: fix parsing of "git config --get-color some.key -1"Jeff King2014-11-201-14/+13