aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Fourth batch of topics for 2.10Junio C Hamano2016-07-11
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of git://bogomips.org/git-svnJunio C Hamano2016-07-11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | git-svn: warn instead of dying when commit data is missingEric Wong2016-07-09
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | git-svn: clone: Fail on missing url argumentChristopher Layne2016-07-03
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/color-on-windows-comment'Junio C Hamano2016-07-11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | color.h: remove obsolete comment about limitations on WindowsJohannes Schindelin2016-06-28
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mj/log-show-signature-conf'Junio C Hamano2016-07-11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | log: add log.showSignature configuration variableMehul Jain2016-06-24
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | log: add "--no-show-signature" command line optionMehul Jain2016-06-24
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | t4202: refactor testMehul Jain2016-06-24
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/find-commit-subject-ignore-leading-blanks'Junio C Hamano2016-07-11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reset --hard: skip blank lines when reporting the commit subjectJohannes Schindelin2016-06-29
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sequencer: use skip_blank_lines() to find the commit subjectJohannes Schindelin2016-06-29
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit -C: skip blank lines at the beginning of the messageJohannes Schindelin2016-06-29
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit.c: make find_commit_subject() more robustJohannes Schindelin2016-06-22
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pretty: make the skip_blank_lines() function publicJohannes Schindelin2016-06-22
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jn/preformatted-doc-url'Junio C Hamano2016-07-11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | doc: git-htmldocs.googlecode.com is no moreJonathan Nieder2016-06-22
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/perf-any-version'Junio C Hamano2016-07-11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | p4211: explicitly disable renames in no-rename testJeff King2016-06-22
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t/perf: fix regression in testing older versions of gitJeff King2016-06-22
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/ansi-color'Junio C Hamano2016-07-11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | color: support strike-through attributeJeff King2016-06-23
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | color: support "italic" attributeJeff King2016-06-23
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | color: allow "no-" for negating attributesJeff King2016-06-23
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | color: refactor parse_attrJeff King2016-06-23
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add skip_prefix_mem helperJeff King2016-06-23
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | doc: refactor description of color formatJeff King2016-06-23
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | color: fix max-size commentJeff King2016-06-23
| | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/submodule-clone-retry'Junio C Hamano2016-07-11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | submodule update: continue when a clone failsStefan Beller2016-06-13
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | submodule--helper: initial clone learns retry logicStefan Beller2016-06-13
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/send-email-skip-backup'Junio C Hamano2016-07-11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | send-email: detect and offer to skip backup filesJunio C Hamano2016-04-12
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Third batch of topics for 2.10Junio C Hamano2016-07-06
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sync with maintJunio C Hamano2016-07-06
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More fixes for 2.9.1Junio C Hamano2016-07-06
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/deref-tag' into maintJunio C Hamano2016-07-06
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'pb/strbuf-read-file-doc' into maintJunio C Hamano2016-07-06
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/fetch-prune-doc' into maintJunio C Hamano2016-07-06
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'pc/occurred' into maintJunio C Hamano2016-07-06
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mg/cherry-pick-multi-on-unborn' into maintJunio C Hamano2016-07-06
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'em/newer-freebsd-shells-are-fine-with-returns' into maintJunio C Hamano2016-07-06
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'lv/status-say-working-tree-not-directory' into maintJunio C Hamano2016-07-06
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nb/gnome-keyring-build' into maintJunio C Hamano2016-07-06
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'et/add-chmod-x' into maintJunio C Hamano2016-07-06
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/avoid-unbounded-alloca' into maintJunio C Hamano2016-07-06
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rj/compat-regex-size-max-fix' into maintJunio C Hamano2016-07-06
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'vs/prompt-avoid-unset-variable' into maintJunio C Hamano2016-07-06
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sg/reflog-past-root' into maintJunio C Hamano2016-07-06
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \