summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Documentation/git-status: fix titles in porcelain v2 sectionTodd Zullinger2019-04-011-4/+8
* Documentation/rev-list-options: wrap --date=<format> block with "--"Todd Zullinger2019-04-011-11/+11
* The third batchJunio C Hamano2019-03-201-0/+49
* Merge branch 'br/commit-tree-parseopt'Junio C Hamano2019-03-203-74/+104
|\
| * commit-tree: utilize parse-options apiBrandon Richardson2019-03-083-74/+104
* | Merge branch 'jk/config-type-color-ends-with-lf'Junio C Hamano2019-03-201-1/+3
|\ \
| * | config: document --type=color output is a complete lineJeff King2019-03-071-1/+3
* | | Merge branch 'ma/clear-repository-format'Junio C Hamano2019-03-205-18/+63
|\ \ \
| * | | setup: fix memory leaks with `struct repository_format`Martin Ågren2019-03-015-18/+62
| * | | setup: free old value before setting `work_tree`Martin Ågren2019-01-231-0/+1
* | | | Merge branch 'jk/virtual-objects-do-exist'Junio C Hamano2019-03-202-1/+11
|\ \ \ \
| * | | | rev-list: allow cached objects in existence checkJeff King2019-03-052-1/+11
* | | | | Merge branch 'jk/no-sigpipe-during-network-transport'Junio C Hamano2019-03-203-5/+12
|\ \ \ \ \
| * | | | | fetch: ignore SIGPIPE during network operationJeff King2019-03-051-0/+2
| * | | | | fetch: avoid calling write_or_die()Jeff King2019-03-052-5/+10
| | |_|/ / | |/| | |
* | | | | Merge branch 'jk/fsck-doc'Junio C Hamano2019-03-203-5/+90
|\ \ \ \ \
| * | | | | fsck: always compute USED flags for unreachable objectsJeff King2019-03-053-2/+83
| * | | | | doc/fsck: clarify --connectivity-only behaviorJeff King2019-03-051-3/+7
| |/ / / /
* | | | | Merge branch 'js/stress-test-ui-tweak'Junio C Hamano2019-03-202-4/+13
|\ \ \ \ \
| * | | | | tests: introduce --stress-jobs=<N>Johannes Schindelin2019-03-042-3/+11
| * | | | | tests: let --stress-limit=<N> imply --stressJohannes Schindelin2019-03-042-1/+2
| | |_|_|/ | |/| | |
* | | | | Merge branch 'js/rebase-orig-head-fix'Junio C Hamano2019-03-202-16/+30
|\ \ \ \ \
| * | | | | built-in rebase: set ORIG_HEAD just once, before the rebaseJohannes Schindelin2019-03-042-14/+19
| * | | | | built-in rebase: demonstrate that ORIG_HEAD is not set correctlyJohannes Schindelin2019-03-041-0/+8
| * | | | | built-in rebase: use the correct reflog when switching branchesJohannes Schindelin2019-03-041-1/+1
| * | | | | built-in rebase: no need to check out `onto` twiceJohannes Schindelin2019-03-041-2/+2
* | | | | | Merge branch 'jk/bisect-final-output'Junio C Hamano2019-03-202-17/+8
|\ \ \ \ \ \
| * | | | | | bisect: make diff-tree output prettierJeff King2019-03-012-5/+5
| * | | | | | bisect: fix internal diff-tree config loadingJeff King2019-03-011-1/+1
| * | | | | | bisect: use string arguments to feed internal diff-treeJeff King2019-03-011-13/+4
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'ab/makefile-help-devs-more'Junio C Hamano2019-03-202-52/+55
|\ \ \ \ \ \
| * | | | | | Makefile: allow for combining DEVELOPER=1 and CFLAGS="..."Ævar Arnfjörð Bjarmason2019-02-242-24/+28
| * | | | | | Makefile: move the setting of *FLAGS closer to "include"Ævar Arnfjörð Bjarmason2019-02-241-18/+22
| * | | | | | Makefile: Move *_LIBS assignment into its own sectionÆvar Arnfjörð Bjarmason2019-02-241-1/+3
| * | | | | | Makefile: add/remove comments at top and tweak whitespaceÆvar Arnfjörð Bjarmason2019-02-241-7/+3
| * | | | | | Makefile: move "strip" assignment down from flagsÆvar Arnfjörð Bjarmason2019-02-241-1/+1
| * | | | | | Makefile: remove an out-of-date commentÆvar Arnfjörð Bjarmason2019-02-241-3/+0
* | | | | | | Merge git://ozlabs.org/~paulus/gitkJunio C Hamano2019-03-181-317/+343
|\ \ \ \ \ \ \
| * | | | | | | gitk: Update Bulgarian translation (317t)Alexander Shopov2019-03-141-317/+343
* | | | | | | | The second batchJunio C Hamano2019-03-111-0/+22
* | | | | | | | Sync with maintJunio C Hamano2019-03-111-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | mingw: allow building with an MSYS2 runtime v3.xJohannes Schindelin2019-03-111-1/+1
* | | | | | | | | Merge branch 'js/rebase-recreate-merge'Junio C Hamano2019-03-111-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | rebase docs: fix "gitlink" typoKyle Meyer2019-03-011-1/+1
* | | | | | | | | | Merge branch 'js/untravis-windows'Junio C Hamano2019-03-112-113/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | travis: remove the hack to build the Windows job on Azure PipelinesJohannes Schindelin2019-03-012-113/+0
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'rd/gc-prune-doc-fix'Junio C Hamano2019-03-111-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | docs/git-gc: fix typo "--prune=all" to "--prune=now"Robert P. J. Day2019-03-031-1/+1
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'js/find-lib-h-with-ls-files-when-possible'Junio C Hamano2019-03-111-2/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Makefile: use `git ls-files` to list header files, if possibleJohannes Schindelin2019-03-051-2/+3
| | |_|_|/ / / / / / | |/| | | | | | | |