Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | builtin/apply: make parse_single_patch() return -1 on error | Christian Couder | 2016-08-11 | 1 | -2/+2 |
* | builtin/apply: make find_header() return -128 instead of die()ing | Christian Couder | 2016-08-11 | 1 | -1/+1 |
* | t9100: portability fix | Junio C Hamano | 2016-07-28 | 1 | -2/+4 |
* | Merge branch 'master' of git://git.bogomips.org/git-svn | Junio C Hamano | 2016-07-28 | 1 | -0/+19 |
|\ | |||||
| * | git-svn: allow --version to work anywhere | Eric Wong | 2016-07-22 | 1 | -0/+19 |
* | | Merge branch 'nd/pack-ofs-4gb-limit' | Junio C Hamano | 2016-07-28 | 1 | -4/+3 |
|\ \ | |||||
| * | | fsck: use streaming interface for large blobs in packnd/pack-ofs-4gb-limit | Nguyễn Thái Ngọc Duy | 2016-07-13 | 1 | -4/+3 |
* | | | Merge branch 'nd/worktree-lock' | Junio C Hamano | 2016-07-28 | 1 | -0/+62 |
|\ \ \ | |||||
| * | | | worktree: add "unlock" command | Nguyễn Thái Ngọc Duy | 2016-07-08 | 1 | -0/+14 |
| * | | | worktree: add "lock" command | Nguyễn Thái Ngọc Duy | 2016-07-08 | 1 | -0/+48 |
* | | | | Merge branch 'js/rebase-i-tests' | Junio C Hamano | 2016-07-28 | 2 | -0/+41 |
|\ \ \ \ | |||||
| * | | | | rebase -i: we allow extra spaces after fixup!/squash!js/rebase-i-tests | Johannes Schindelin | 2016-07-07 | 1 | -0/+9 |
| * | | | | rebase -i: demonstrate a bug with --autosquash | Johannes Schindelin | 2016-07-07 | 1 | -0/+24 |
| * | | | | t3404: add a test for the --gpg-sign option | Johannes Schindelin | 2016-07-07 | 1 | -0/+8 |
* | | | | | Merge branch 'mh/blame-worktree' | Junio C Hamano | 2016-07-25 | 1 | -17/+62 |
|\ \ \ \ \ | |||||
| * | | | | | t/t8003-blame-corner-cases.sh: Use here documents | Mike Hommey | 2016-07-18 | 1 | -17/+17 |
| * | | | | | blame: allow to blame paths freshly added to the index | Mike Hommey | 2016-07-18 | 1 | -0/+45 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'js/fsck-name-object' | Junio C Hamano | 2016-07-25 | 1 | -0/+22 |
|\ \ \ \ \ | |||||
| * | | | | | fsck: optionally show more helpful info for broken links | Johannes Schindelin | 2016-07-18 | 1 | -0/+22 |
* | | | | | | Merge branch 'nd/cache-tree-ita' | Junio C Hamano | 2016-07-25 | 14 | -50/+76 |
|\ \ \ \ \ \ | |||||
| * | | | | | | cache-tree: do not generate empty trees as a result of all i-t-a subentriesnd/cache-tree-ita | Nguyễn Thái Ngọc Duy | 2016-07-18 | 1 | -0/+14 |
| * | | | | | | cache-tree.c: fix i-t-a entry skipping directory updates sometimes | Nguyễn Thái Ngọc Duy | 2016-07-18 | 1 | -0/+17 |
| * | | | | | | test-lib.sh: introduce and use $EMPTY_BLOB | Nguyễn Thái Ngọc Duy | 2016-07-18 | 8 | -38/+35 |
| * | | | | | | test-lib.sh: introduce and use $EMPTY_TREE | Nguyễn Thái Ngọc Duy | 2016-07-18 | 6 | -13/+11 |
* | | | | | | | Merge branch 'jk/push-scrub-url' | Junio C Hamano | 2016-07-25 | 1 | -0/+9 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | t5541: fix url scrubbing test when GPG is not setjk/push-scrub-url | Jeff King | 2016-07-20 | 1 | -2/+4 |
| * | | | | | | | push: anonymize URL in status output | Jeff King | 2016-07-14 | 1 | -0/+7 |
* | | | | | | | | Merge branch 'nd/test-helpers' | Junio C Hamano | 2016-07-25 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | t/test-lib.sh: fix running tests with --valgrind | Johannes Schindelin | 2016-07-11 | 1 | -1/+1 |
* | | | | | | | | | Merge branch 'jc/renormalize-merge-kill-safer-crlf' | Junio C Hamano | 2016-07-25 | 3 | -48/+59 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | merge: avoid "safer crlf" during recording of merge results | Junio C Hamano | 2016-07-12 | 1 | -23/+28 |
| * | | | | | | | | | convert: unify the "auto" handling of CRLF | Torsten Bögershausen | 2016-07-06 | 3 | -25/+31 |
* | | | | | | | | | | Merge branch 'js/ignore-space-at-eol' | Junio C Hamano | 2016-07-25 | 1 | -0/+8 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | diff: fix a double off-by-one with --ignore-space-at-eoljs/ignore-space-at-eol | Johannes Schindelin | 2016-07-11 | 1 | -1/+1 |
| * | | | | | | | | | | diff: demonstrate a bug with --patience and --ignore-space-at-eol | Johannes Schindelin | 2016-07-11 | 1 | -0/+8 |
| | |_|/ / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'mh/update-ref-errors' | Junio C Hamano | 2016-07-25 | 2 | -181/+407 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | lock_ref_for_update(): make error handling more uniform | Michael Haggerty | 2016-06-20 | 1 | -7/+7 |
| * | | | | | | | | | | t1404: add more tests of update-ref error handling | Michael Haggerty | 2016-06-20 | 1 | -2/+219 |
| * | | | | | | | | | | t1404: document function test_update_rejected | Michael Haggerty | 2016-06-20 | 1 | -0/+10 |
| * | | | | | | | | | | t1404: remove "prefix" argument to test_update_rejected | Michael Haggerty | 2016-06-20 | 1 | -14/+13 |
| * | | | | | | | | | | t1404: rename file to t1404-update-ref-errors.sh | Michael Haggerty | 2016-06-20 | 1 | -1/+1 |
* | | | | | | | | | | | Merge branch 'mh/split-under-lock' | Junio C Hamano | 2016-07-25 | 4 | -5/+123 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | |||||
| * | | | | | | | | | | refs: resolve symbolic refs first | Michael Haggerty | 2016-06-13 | 1 | -0/+35 |
| * | | | | | | | | | | ref_transaction_update(): check refname_is_safe() at a minimum | Michael Haggerty | 2016-06-13 | 2 | -2/+2 |
| * | | | | | | | | | | refs: don't dereference on rename | David Turner | 2016-06-13 | 1 | -0/+9 |
| * | | | | | | | | | | refs: make error messages more consistent | Michael Haggerty | 2016-06-13 | 1 | -2/+2 |
| * | | | | | | | | | | read_raw_ref(): don't get confused by an empty directory | Michael Haggerty | 2016-05-05 | 1 | -1/+1 |
| * | | | | | | | | | | t1404: demonstrate a bug resolving references | Michael Haggerty | 2016-05-05 | 1 | -1/+75 |
* | | | | | | | | | | | Merge branch 'ls/p4-tmp-refs' | Junio C Hamano | 2016-07-19 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | git-p4: place temporary refs used for branch import under refs/git-p4-tmpls/p4-tmp-refs | Lars Schneider | 2016-07-08 | 1 | -2/+2 |