summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | | | | | | merge-recursive: handle return values indicating errorsJohannes Schindelin2016-07-261-102/+150
| * | | | | | | | | | | | | | | | | | | | | | | merge-recursive: allow write_tree_from_memory() to error outJohannes Schindelin2016-07-261-2/+2
| * | | | | | | | | | | | | | | | | | | | | | | merge-recursive: avoid returning a wholesale structJohannes Schindelin2016-07-261-50/+56
| * | | | | | | | | | | | | | | | | | | | | | | merge_recursive: abort properly upon errorsJohannes Schindelin2016-07-261-5/+12
| * | | | | | | | | | | | | | | | | | | | | | | prepare the builtins for a libified merge_recursive()Johannes Schindelin2016-07-263-1/+9
| * | | | | | | | | | | | | | | | | | | | | | | merge-recursive: clarify code in was_tracked()Johannes Schindelin2016-07-261-16/+14
| * | | | | | | | | | | | | | | | | | | | | | | die(_("BUG")): avoid translating bug messagesJohannes Schindelin2016-07-261-3/+3
| * | | | | | | | | | | | | | | | | | | | | | | die("bug"): report bugs consistentlyJohannes Schindelin2016-07-269-21/+21
| * | | | | | | | | | | | | | | | | | | | | | | t5520: verify that `pull --rebase` shows the helpful advice when failingJohannes Schindelin2016-07-261-0/+32
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/commit-slab-decl-fix'Junio C Hamano2016-08-102-4/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | commit-slab.h: avoid duplicated global static variablesjs/commit-slab-decl-fixJohannes Sixt2016-08-091-3/+3
| * | | | | | | | | | | | | | | | | | | | | | | | config.c: avoid duplicated global static variablesJohannes Sixt2016-08-091-1/+0
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/completion-diff-submodule'Junio C Hamano2016-08-101-0/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | completion: add completion for --submodule=* diff optionjk/completion-diff-submoduleJacob Keller2016-08-091-0/+19
| | |_|_|/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'cc/mailmap-tuxfamily'Junio C Hamano2016-08-101-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | .mailmap: use Christian Couder's Tuxfamily addresscc/mailmap-tuxfamilyChristian Couder2016-08-081-0/+1
| |/ / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jt/format-patch-from-config'Junio C Hamano2016-08-104-1/+63
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | format-patch: format.from gives the default for --fromjt/format-patch-from-configJosh Triplett2016-08-014-1/+63
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/push-force-with-lease-creation'Junio C Hamano2016-08-104-7/+46
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | t5533: make it pass on case-sensitive filesystemsjk/push-force-with-lease-creationJohannes Schindelin2016-08-041-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | push: allow pushing new branches with --force-with-leaseJohn Keeping2016-07-263-5/+15
| * | | | | | | | | | | | | | | | | | | | | | | | | | push: add shorthand for --force-with-lease branch creationJohn Keeping2016-07-263-1/+30
| * | | | | | | | | | | | | | | | | | | | | | | | | | Documentation/git-push: fix placeholder formattingJohn Keeping2016-07-251-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/reset-ident-time-per-commit'Junio C Hamano2016-08-103-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | am: reset cached ident date for each patchjk/reset-ident-time-per-commitJeff King2016-08-013-0/+8
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Sync with maintJunio C Hamano2016-08-081-0/+34
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Hopefully final batch for 2.9.3Junio C Hamano2016-08-081-0/+34
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/pack-protocol-doc-nak' into maintJunio C Hamano2016-08-081-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/submodule-config-code-cleanup' into maintJunio C Hamano2016-08-083-17/+28
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sb/submodule-deinit-all' into maintJunio C Hamano2016-08-081-2/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/worktree-use-strbuf-absolute-path' into maintJunio C Hamano2016-08-081-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/doc-diff-filter-exclude' into maintJunio C Hamano2016-08-081-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/test-helpers' into maintJunio C Hamano2016-08-082-11/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/use-strbuf-addbuf' into maintJunio C Hamano2016-08-085-8/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'lf/recv-sideband-cleanup' into maintJunio C Hamano2016-08-081-74/+58
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ah/unpack-trees-advice-messages' into maintJunio C Hamano2016-08-084-16/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'lf/sideband-returns-void' into maintJunio C Hamano2016-08-083-15/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/send-pack-stdio' into maintJunio C Hamano2016-08-083-29/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'pb/commit-editmsg-path' into maintJunio C Hamano2016-08-081-7/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ew/find-perl-on-freebsd-in-local' into maintJunio C Hamano2016-08-081-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ew/daemon-socket-keepalive' into maintJunio C Hamano2016-08-082-3/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/pack-ofs-4gb-limit' into maintJunio C Hamano2016-08-089-29/+54
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/notes-merge-no-toctou' into maintJunio C Hamano2016-08-081-5/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/ignore-space-at-eol' into maintJunio C Hamano2016-08-083-3/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/push-scrub-url' into maintJunio C Hamano2016-08-082-2/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/cache-tree-ita' into maintJunio C Hamano2016-08-0815-53/+87
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mh/blame-worktree' into maintJunio C Hamano2016-08-082-18/+71
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Eleventh batch for 2.10Junio C Hamano2016-08-081-20/+65
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/hashmap-doc-init'Junio C Hamano2016-08-081-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hashmap: clarify that hashmap_entry can safely be discardedjc/hashmap-doc-initJunio C Hamano2016-08-021-0/+5
View Lorry Controller Status