summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* hooks/pre-auto-gc-battery: allow gc to run on non-laptopsab/pre-auto-gc-batteryAdam Borowski2018-02-281-1/+1
* Merge branch 'ys/bisect-object-id-missing-conversion-fix' into maintJunio C Hamano2018-02-271-3/+3
|\
| * bisect: debug: convert struct object to object_idYasushi SHOJI2018-01-091-3/+3
* | Merge branch 'sb/submodule-update-reset-fix' into maintJunio C Hamano2018-02-273-3/+23
|\ \
| * | submodule: submodule_move_head omits old argument in forced casesb/submodule-update-reset-fixStefan Beller2018-01-052-1/+17
| * | unpack-trees: oneway_merge to update submodulesStefan Beller2018-01-051-0/+3
| * | t/lib-submodule-update.sh: fix test ignoring ignored files in submodulesStefan Beller2018-01-051-0/+1
| * | t/lib-submodule-update.sh: clarify testStefan Beller2018-01-051-2/+2
* | | Merge branch 'ab/commit-m-with-fixup' into maintJunio C Hamano2018-02-273-4/+15
|\ \ \
| * | | commit: add support for --fixup <commit> -m"<extra message>"ab/commit-m-with-fixupÆvar Arnfjörð Bjarmason2017-12-223-6/+14
| * | | commit doc: document that -c, -C, -F and --fixup with -m errorÆvar Arnfjörð Bjarmason2017-12-221-0/+3
* | | | Merge branch 'nd/ita-wt-renames-in-status' into maintJunio C Hamano2018-02-276-44/+143
|\ \ \ \
| * | | | wt-status.c: handle worktree renamesnd/ita-wt-renames-in-statusNguyễn Thái Ngọc Duy2017-12-273-13/+92
| * | | | wt-status.c: rename rename-related fields in wt_status_change_dataNguyễn Thái Ngọc Duy2017-12-272-26/+29
| * | | | wt-status.c: catch unhandled diff status codesNguyễn Thái Ngọc Duy2017-12-271-2/+6
| * | | | wt-status.c: coding style fixNguyễn Thái Ngọc Duy2017-12-271-1/+2
| * | | | Use DIFF_DETECT_RENAME for detect_rename assignmentsNguyễn Thái Ngọc Duy2017-12-273-4/+4
| * | | | t2203: test status output with porcelain v2 formatNguyễn Thái Ngọc Duy2017-12-271-0/+12
* | | | | Git 2.16.2v2.16.2Junio C Hamano2018-02-153-2/+32
* | | | | Merge branch 'ab/doc-cat-file-e-still-shows-errors' into maintJunio C Hamano2018-02-151-3/+4
|\ \ \ \ \
| * | | | | cat-file doc: document that -e will return some outputab/doc-cat-file-e-still-shows-errorsÆvar Arnfjörð Bjarmason2018-01-101-3/+4
* | | | | | Merge branch 'as/read-tree-prefix-doc-fix' into maintJunio C Hamano2018-02-151-3/+2
|\ \ \ \ \ \
| * | | | | | doc/read-tree: remove obsolete remarkas/read-tree-prefix-doc-fixAndreas G. Schacker2018-01-091-3/+2
* | | | | | | Merge branch 'nd/add-i-ignore-submodules' into maintJunio C Hamano2018-02-152-1/+49
|\ \ \ \ \ \ \
| * | | | | | | add--interactive: ignore submodule changes except HEADnd/add-i-ignore-submodulesNguyễn Thái Ngọc Duy2018-01-162-1/+49
* | | | | | | | Merge branch 'tg/stash-with-pathspec-fix' into maintJunio C Hamano2018-02-152-3/+34
|\ \ \ \ \ \ \ \
| * | | | | | | | stash: don't delete untracked files that match pathspectg/stash-with-pathspec-fixThomas Gummerer2018-01-082-3/+34
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'jk/abort-clone-with-existing-dest' into maintJunio C Hamano2018-02-152-33/+98
|\ \ \ \ \ \ \ \
| * | | | | | | | clone: do not clean up directories we didn't createjk/abort-clone-with-existing-destJeff King2018-01-032-9/+67
| * | | | | | | | clone: factor out dir_exists() helperJeff King2018-01-031-3/+8
| * | | | | | | | t5600: modernize styleJeff King2018-01-031-23/+25
| * | | | | | | | t5600: fix outdated comment about unborn HEADJeff King2018-01-031-1/+1
| |/ / / / / / /
* | | | | | | | Merge branch 'jc/merge-symlink-ours-theirs' into maintJunio C Hamano2018-02-152-4/+45
|\ \ \ \ \ \ \ \
| * | | | | | | | merge: teach -Xours/-Xtheirs to symbolic link mergejc/merge-symlink-ours-theirsJunio C Hamano2018-01-032-4/+45
* | | | | | | | | Merge branch 'rs/lose-leak-pending' into maintJunio C Hamano2018-02-1510-86/+46
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | commit: remove unused function clear_commit_marks_for_object_array()rs/lose-leak-pendingRené Scharfe2017-12-282-15/+0
| * | | | | | | | | revision: remove the unused flag leak_pendingRené Scharfe2017-12-282-14/+1
| * | | | | | | | | checkout: avoid using the rev_info flag leak_pendingRené Scharfe2017-12-281-12/+1
| * | | | | | | | | bundle: avoid using the rev_info flag leak_pendingRené Scharfe2017-12-281-19/+16
| * | | | | | | | | bisect: avoid using the rev_info flag leak_pendingRené Scharfe2017-12-281-21/+9
| * | | | | | | | | object: add clear_commit_marks_all()René Scharfe2017-12-282-0/+16
| * | | | | | | | | ref-filter: use clear_commit_marks_many() in do_merge_filter()René Scharfe2017-12-281-2/+1
| * | | | | | | | | commit: use clear_commit_marks_many() in remove_redundant()René Scharfe2017-12-281-2/+1
| * | | | | | | | | commit: avoid allocation in clear_commit_marks_many()René Scharfe2017-12-281-1/+1
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jm/svn-pushmergeinfo-fix' into maintJunio C Hamano2018-02-151-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | git-svn: fix svn.pushmergeinfo handling of svn+ssh usernames.jm/svn-pushmergeinfo-fixJason Merrill2017-09-171-0/+1
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'dk/describe-all-output-fix' into maintJunio C Hamano2018-02-152-3/+10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | describe: prepend "tags/" when describing tags with embedded namedk/describe-all-output-fixDaniel Knittl-Frank2017-12-272-3/+10
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'ab/perf-grep-threads' into maintJunio C Hamano2018-02-152-21/+86
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | perf: amend the grep tests to test grep.threadsab/perf-grep-threadsÆvar Arnfjörð Bjarmason2018-01-042-21/+86
| | |_|_|_|_|_|/ / | |/| | | | | | |
View Lorry Controller Status