aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
| * | | | | | | | | | | | | | | | | | | | | | | | | | | am -3: use merge_recursive() directly againJohannes Schindelin2016-07-26
| * | | | | | | | | | | | | | | | | | | | | | | | | | | merge-recursive: switch to returning errors instead of dyingJohannes Schindelin2016-07-26
| * | | | | | | | | | | | | | | | | | | | | | | | | | | merge-recursive: handle return values indicating errorsJohannes Schindelin2016-07-26
| * | | | | | | | | | | | | | | | | | | | | | | | | | | merge-recursive: allow write_tree_from_memory() to error outJohannes Schindelin2016-07-26
| * | | | | | | | | | | | | | | | | | | | | | | | | | | merge-recursive: avoid returning a wholesale structJohannes Schindelin2016-07-26
| * | | | | | | | | | | | | | | | | | | | | | | | | | | merge_recursive: abort properly upon errorsJohannes Schindelin2016-07-26
| * | | | | | | | | | | | | | | | | | | | | | | | | | | prepare the builtins for a libified merge_recursive()Johannes Schindelin2016-07-26
| * | | | | | | | | | | | | | | | | | | | | | | | | | | merge-recursive: clarify code in was_tracked()Johannes Schindelin2016-07-26
| * | | | | | | | | | | | | | | | | | | | | | | | | | | die(_("BUG")): avoid translating bug messagesJohannes Schindelin2016-07-26
| * | | | | | | | | | | | | | | | | | | | | | | | | | | die("bug"): report bugs consistentlyJohannes Schindelin2016-07-26
| * | | | | | | | | | | | | | | | | | | | | | | | | | | t5520: verify that `pull --rebase` shows the helpful advice when failingJohannes Schindelin2016-07-26
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/commit-slab-decl-fix'Junio C Hamano2016-08-10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | commit-slab.h: avoid duplicated global static variablesJohannes Sixt2016-08-09
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | config.c: avoid duplicated global static variablesJohannes Sixt2016-08-09
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/completion-diff-submodule'Junio C Hamano2016-08-10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | completion: add completion for --submodule=* diff optionJacob Keller2016-08-09
| | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'cc/mailmap-tuxfamily'Junio C Hamano2016-08-10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | .mailmap: use Christian Couder's Tuxfamily addressChristian Couder2016-08-08
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jt/format-patch-from-config'Junio C Hamano2016-08-10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | format-patch: format.from gives the default for --fromJosh Triplett2016-08-01
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
generated by cgit v1.2.1 (git 2.18.0) at 2024-07-09 12:29:24 +0000