summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | Merge branch 'rs/cocci' into maintJunio C Hamano2016-10-2815-45/+99
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/diff-unique-abbrev-comments' into maintJunio C Hamano2016-10-281-1/+22
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/pretty-format-color-doc-fix' into maintJunio C Hamano2016-10-281-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/reset-usage' into maintJunio C Hamano2016-10-281-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'po/fix-doc-merge-base-illustration' into maintJunio C Hamano2016-10-282-21/+21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/tap-verbose-fix' into maintJunio C Hamano2016-10-283-5/+37
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tg/add-chmod+x-fix' into maintJunio C Hamano2016-10-281-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bw/submodule-branch-dot-doc' into maintJunio C Hamano2016-10-282-3/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/tighten-alloc' into maintJunio C Hamano2016-10-281-11/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/fetch-quick-tag-following' into maintJunio C Hamano2016-10-284-4/+112
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/merge-base-fork-point-without-reflog' into maintJunio C Hamano2016-10-282-0/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dk/worktree-dup-checkout-with-bare-is-ok' into maintJunio C Hamano2016-10-282-0/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sb/submodule-config-doc-drop-path' into maintJunio C Hamano2016-10-281-5/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/ref-symlink-loop' into maintJunio C Hamano2016-10-282-1/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/commit-p-doc' into maintJunio C Hamano2016-10-281-2/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/clone-copy-alternates-fix' into maintJunio C Hamano2016-10-281-2/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dt/http-empty-auth' into maintJunio C Hamano2016-10-281-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dp/autoconf-curl-ssl' into maintJunio C Hamano2016-10-281-10/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ak/curl-imap-send-explicit-scheme' into maintJunio C Hamano2016-10-281-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jt/fetch-pack-in-vain-count-with-stateless' into maintJunio C Hamano2016-10-281-2/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/regexec-buf' into maintJunio C Hamano2016-10-281-6/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/c-auto-resets-attributes' into maintJunio C Hamano2016-10-281-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'yk/git-tag-remove-mention-of-old-layout-in-doc' into maintJunio C Hamano2016-10-281-3/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Getting ready for 2.11-rc0Junio C Hamano2016-10-271-1/+36
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'svn-cache' of git://bogomips.org/git-svnJunio C Hamano2016-10-271-1/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git-svn: do not reuse caches memoized for a different architectureGavin Lambert2016-10-271-1/+11
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'svn-wt' of git://bogomips.org/git-svnJunio C Hamano2016-10-276-48/+69
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git-svn: "git worktree" awarenessew/svn-wtEric Wong2016-10-143-28/+42
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git-svn: reduce scope of input record separator changeEric Wong2016-10-144-20/+27
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/ita-empty-commit'Junio C Hamano2016-10-279-13/+89
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit: don't be fooled by ita entries when creating initial commitnd/ita-empty-commitNguyễn Thái Ngọc Duy2016-10-242-3/+18
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit: fix empty commit creation when there's no changes but ita entriesNguyễn Thái Ngọc Duy2016-10-245-5/+18
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | diff: add --ita-[in]visible-in-indexNguyễn Thái Ngọc Duy2016-10-243-1/+15
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | diff-lib: allow ita entries treated as "not yet exist in index"Nguyễn Thái Ngọc Duy2016-10-245-4/+38
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/prepare-sequencer'Junio C Hamano2016-10-275-261/+492
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sequencer: mark all error messages for translationJohannes Schindelin2016-10-211-10/+16
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sequencer: start error messages consistently with lower caseJohannes Schindelin2016-10-212-35/+35
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sequencer: quote filenames in error messagesJohannes Schindelin2016-10-211-11/+11
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sequencer: mark action_name() for translationJohannes Schindelin2016-10-211-7/+7
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sequencer: remove overzealous assumption in rebase -i modeJohannes Schindelin2016-10-211-3/+4
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sequencer: teach write_message() to append an optional LFJohannes Schindelin2016-10-211-3/+8
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sequencer: refactor write_message() to take a pointer/lengthJohannes Schindelin2016-10-211-4/+6
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sequencer: roll back lock file if write_message() failedJohannes Schindelin2016-10-211-3/+7
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sequencer: stop releasing the strbuf in write_message()Johannes Schindelin2016-10-211-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sequencer: left-trim lines read from the scriptJohannes Schindelin2016-10-211-0/+3
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sequencer: support cleaning up commit messagesJohannes Schindelin2016-10-211-3/+7
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sequencer: support amending commitsJohannes Schindelin2016-10-211-2/+4
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sequencer: allow editing the commit message on a case-by-case basisJohannes Schindelin2016-10-211-8/+40
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sequencer: introduce a helper to read files written by scriptsJohannes Schindelin2016-10-211-0/+34
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sequencer: prepare for rebase -i's commit functionalityJohannes Schindelin2016-10-211-10/+89