aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
| * | | | | | | | | | | | t4150-am: refactor am -3 testsRemi Lespinet2015-06-04
| * | | | | | | | | | | | git-am.sh: fix initialization of the threeway variableRemi Lespinet2015-06-04
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'jc/ll-merge-expose-path'Junio C Hamano2015-06-24
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | ll-merge: pass the original path to external driversJunio C Hamano2015-06-04
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'es/osx-header-pollutes-mask-macro'Junio C Hamano2015-06-24
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | ewah: use less generic macro nameJeff King2015-06-03
| * | | | | | | | | | | | ewah/bitmap: silence warning about MASK macro redefinitionEric Sunshine2015-06-03
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'es/configure-getdelim'Junio C Hamano2015-06-24
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | configure: add getdelim() checkEric Sunshine2015-06-03
| * | | | | | | | | | | | config.mak.uname: Darwin: define HAVE_GETDELIM for modern OS X releasesEric Sunshine2015-06-03
* | | | | | | | | | | | | Merge branch 'pt/pull-optparse'Junio C Hamano2015-06-24
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | pull: use git-rev-parse --parseopt for option parsingPaul Tan2015-06-02
| * | | | | | | | | | | | | pull: handle git-fetch's options as wellPaul Tan2015-06-02
| * | | | | | | | | | | | | Merge branch 'pt/pull-tests' into pt/pull-optparseJunio C Hamano2015-06-02
| |\ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'qn/blame-show-email'Junio C Hamano2015-06-24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | blame: add blame.showEmail configurationQuentin Neill2015-06-01
| | |_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'jc/do-not-feed-tags-to-clear-commit-marks'Junio C Hamano2015-06-24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | format-patch: do not feed tags to clear_commit_marks()Junio C Hamano2015-06-01
| | |_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'es/send-email-sendmail-alias'Junio C Hamano2015-06-24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | send-email: further warn about unsupported sendmail aliases featuresEric Sunshine2015-06-01
| * | | | | | | | | | | | | | | t9001: add sendmail aliases line continuation testsEric Sunshine2015-06-01
| * | | | | | | | | | | | | | | t9001: refactor sendmail aliases test infrastructureEric Sunshine2015-06-01
| * | | | | | | | | | | | | | | send-email: implement sendmail aliases line continuation supportEric Sunshine2015-06-01
| * | | | | | | | | | | | | | | send-email: simplify sendmail aliases comment and blank line recognizerEric Sunshine2015-06-01
| * | | | | | | | | | | | | | | send-email: refactor sendmail aliases parserEric Sunshine2015-06-01
| * | | | | | | | | | | | | | | send-email: fix style: cuddle 'elsif' and 'else' with closing braceEric Sunshine2015-06-01
| * | | | | | | | | | | | | | | send-email: drop noise comments which merely repeat what code saysEric Sunshine2015-06-01
| * | | | | | | | | | | | | | | send-email: visually distinguish sendmail aliases parser warningsEric Sunshine2015-06-01
| * | | | | | | | | | | | | | | send-email: further document missing sendmail aliases functionalityEric Sunshine2015-06-01
* | | | | | | | | | | | | | | | Merge branch 'jc/apply-reject-noop-hunk'Junio C Hamano2015-06-24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | apply: reject a hunk that does not do anythingJunio C Hamano2015-06-01
| | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | git-multimail: update to release 1.1.0Matthieu Moy2015-06-18
* | | | | | | | | | | | | | | | Eighth batch for 2.5Junio C Hamano2015-06-16
* | | | | | | | | | | | | | | | Sync with 2.4.4Junio C Hamano2015-06-16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Git 2.4.4v2.4.4Junio C Hamano2015-06-16
| * | | | | | | | | | | | | | | | Merge branch 'jk/clone-dissociate' into maintJunio C Hamano2015-06-16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sb/submodule-doc-intro' into maintJunio C Hamano2015-06-16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sb/glossary-submodule' into maintJunio C Hamano2015-06-16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ah/usage-strings' into maintJunio C Hamano2015-06-16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mc/commit-doc-grammofix' into maintJunio C Hamano2015-06-16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/janitorial' into maintJunio C Hamano2015-06-16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sb/test-bitmap-free-at-end' into maintJunio C Hamano2015-06-16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dt/clean-pathspec-filter-then-lstat' into maintJunio C Hamano2015-06-16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/http-backend-deadlock' into maintJunio C Hamano2015-06-16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jh/filter-empty-contents' into maintJunio C Hamano2015-06-16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/stash-options' into maintJunio C Hamano2015-06-16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mm/log-format-raw-doc' into maintJunio C Hamano2015-06-16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ep/do-not-feed-a-pointer-to-array-size' into maintJunio C Hamano2015-06-16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge tag 'l10n-2.4-maint-de-updates' of git://github.com/git-l10n/git-po int...Junio C Hamano2015-06-14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | l10n: de.po: translation fix for fall-back to 3way mergeMichael J Gruber2015-06-12