aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'jk/push-force-with-lease-creation'Junio C Hamano2016-08-10
|\
| * t5533: make it pass on case-sensitive filesystemsJohannes Schindelin2016-08-04
| * push: allow pushing new branches with --force-with-leaseJohn Keeping2016-07-26
| * push: add shorthand for --force-with-lease branch creationJohn Keeping2016-07-26
| * Documentation/git-push: fix placeholder formattingJohn Keeping2016-07-25
* | Merge branch 'jk/reset-ident-time-per-commit'Junio C Hamano2016-08-10
|\ \
| * | am: reset cached ident date for each patchJeff King2016-08-01
* | | Sync with maintJunio C Hamano2016-08-08
|\ \ \
| * | | Hopefully final batch for 2.9.3Junio C Hamano2016-08-08
| * | | Merge branch 'sb/pack-protocol-doc-nak' into maintJunio C Hamano2016-08-08
| |\ \ \
| * \ \ \ Merge branch 'rs/submodule-config-code-cleanup' into maintJunio C Hamano2016-08-08
| |\ \ \ \
| * \ \ \ \ Merge branch 'sb/submodule-deinit-all' into maintJunio C Hamano2016-08-08
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'rs/worktree-use-strbuf-absolute-path' into maintJunio C Hamano2016-08-08
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jc/doc-diff-filter-exclude' into maintJunio C Hamano2016-08-08
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'nd/test-helpers' into maintJunio C Hamano2016-08-08
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'rs/use-strbuf-addbuf' into maintJunio C Hamano2016-08-08
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'lf/recv-sideband-cleanup' into maintJunio C Hamano2016-08-08
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'ah/unpack-trees-advice-messages' into maintJunio C Hamano2016-08-08
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'lf/sideband-returns-void' into maintJunio C Hamano2016-08-08
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/send-pack-stdio' into maintJunio C Hamano2016-08-08
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'pb/commit-editmsg-path' into maintJunio C Hamano2016-08-08
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ew/find-perl-on-freebsd-in-local' into maintJunio C Hamano2016-08-08
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ew/daemon-socket-keepalive' into maintJunio C Hamano2016-08-08
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/pack-ofs-4gb-limit' into maintJunio C Hamano2016-08-08
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/notes-merge-no-toctou' into maintJunio C Hamano2016-08-08
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/ignore-space-at-eol' into maintJunio C Hamano2016-08-08
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/push-scrub-url' into maintJunio C Hamano2016-08-08
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/cache-tree-ita' into maintJunio C Hamano2016-08-08
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mh/blame-worktree' into maintJunio C Hamano2016-08-08
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | Eleventh batch for 2.10Junio C Hamano2016-08-08
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/hashmap-doc-init'Junio C Hamano2016-08-08
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | hashmap: clarify that hashmap_entry can safely be discardedJunio C Hamano2016-08-02
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ew/build-time-pager-tweaks'Junio C Hamano2016-08-08
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | pager: move pager-specific setup into the buildEric Wong2016-08-04
| | |/ / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/submodule-recommend-shallowness'Junio C Hamano2016-08-08
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | gitmodules: document shallow recommendationStefan Beller2016-08-03
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/parseopt-string-list'Junio C Hamano2016-08-08
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | blame: drop strdup of string literalEric Sunshine2016-08-03
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jh/clean-smudge-f-doc'Junio C Hamano2016-08-08
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | clarify %f documentationJoey Hess2016-08-03
| | |_|/ / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/nedmalloc-gcc6-warnings'Junio C Hamano2016-08-08
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | nedmalloc: work around overzealous GCC 6 warningRené Scharfe2016-08-05
| * | | | | | | | | | | | | | | | | | | | | | | | | | | nedmalloc: fix misleading indentationJohannes Schindelin2016-08-04
| |/ / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/fbsd-lazy-mtime'Junio C Hamano2016-08-08
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | t7063: work around FreeBSD's lazy mtime update featureNguyễn Thái Ngọc Duy2016-08-04
| |/ / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/log-decorate-color-head-arrow'Junio C Hamano2016-08-08
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | log: decorate HEAD -> branch with the same color for arrow and HEADNguyễn Thái Ngọc Duy2016-07-12
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/use-strbuf-addstr'Junio C Hamano2016-08-08
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | use strbuf_addstr() instead of strbuf_addf() with "%s"René Scharfe2016-08-05
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | use strbuf_addstr() for adding constant strings to a strbufRené Scharfe2016-08-01
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |