summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | | | am --skip: support skipping while on unborn branchPaul Tan2015-06-082-3/+11
| * | | | | | | | | | | | | | | | | | | | am -3: support 3way merge on unborn branchPaul Tan2015-06-082-1/+11
| * | | | | | | | | | | | | | | | | | | | am --skip: revert changes introduced by failed 3way mergePaul Tan2015-06-082-1/+17
| | |_|_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'nd/untracked-cache'Junio C Hamano2015-06-241-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | read-cache: fix untracked cache invalidation when split-index is usednd/untracked-cacheNguyễn Thái Ngọc Duy2015-06-081-1/+2
* | | | | | | | | | | | | | | | | | | | | Merge branch 'mh/fsck-reflog-entries'Junio C Hamano2015-06-241-14/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | fsck: report errors if reflog entries point at invalid objectsmh/fsck-reflog-entriesMichael Haggerty2015-06-081-4/+9
| * | | | | | | | | | | | | | | | | | | | | fsck_handle_reflog_sha1(): new functionMichael Haggerty2015-06-081-14/+15
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/sleep-without-select'Junio C Hamano2015-06-244-23/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | lockfile: wait using sleep_millisec() instead of select()js/sleep-without-selectJohannes Sixt2015-06-051-9/+1
| * | | | | | | | | | | | | | | | | | | | | | lockfile: convert retry timeout computations to millisecondJohannes Sixt2015-06-051-13/+8
| * | | | | | | | | | | | | | | | | | | | | | help.c: wrap wait-only poll() invocation in sleep_millisec()Johannes Sixt2015-06-053-1/+7
| * | | | | | | | | | | | | | | | | | | | | | lockfile: replace random() by rand()Johannes Sixt2015-06-051-2/+2
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'es/utf8-stupid-compiler-workaround'Junio C Hamano2015-06-241-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | utf8: NO_ICONV: silence uninitialized variable warninges/utf8-stupid-compiler-workaroundEric Sunshine2015-06-051-1/+3
| | |_|_|_|/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rl/am-3way-config'Junio C Hamano2015-06-244-17/+53
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | git-am: add am.threeWay config variablerl/am-3way-configRemi Lespinet2015-06-044-2/+41
| * | | | | | | | | | | | | | | | | | | | | | | t4150-am: refactor am -3 testsRemi Lespinet2015-06-041-15/+11
| * | | | | | | | | | | | | | | | | | | | | | | git-am.sh: fix initialization of the threeway variableRemi Lespinet2015-06-041-0/+1
| | |_|/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/ll-merge-expose-path'Junio C Hamano2015-06-243-8/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | ll-merge: pass the original path to external driversjc/ll-merge-expose-pathJunio C Hamano2015-06-043-8/+21
| | |_|_|_|/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'es/osx-header-pollutes-mask-macro'Junio C Hamano2015-06-244-29/+29
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | ewah: use less generic macro namees/osx-header-pollutes-mask-macroJeff King2015-06-034-23/+23
| * | | | | | | | | | | | | | | | | | | | | | | ewah/bitmap: silence warning about MASK macro redefinitionEric Sunshine2015-06-031-8/+8
| | |_|/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'es/configure-getdelim'Junio C Hamano2015-06-242-0/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | configure: add getdelim() checkes/configure-getdelimEric Sunshine2015-06-031-0/+6
| * | | | | | | | | | | | | | | | | | | | | | | config.mak.uname: Darwin: define HAVE_GETDELIM for modern OS X releasesEric Sunshine2015-06-031-0/+3
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'pt/pull-optparse'Junio C Hamano2015-06-244-43/+122
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | pull: use git-rev-parse --parseopt for option parsingpt/pull-optparsePaul Tan2015-06-021-40/+57
| * | | | | | | | | | | | | | | | | | | | | | | | pull: handle git-fetch's options as wellPaul Tan2015-06-024-6/+68
| * | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'pt/pull-tests' into pt/pull-optparseJunio C Hamano2015-06-022-36/+175
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'qn/blame-show-email'Junio C Hamano2015-06-243-1/+73
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | blame: add blame.showEmail configurationqn/blame-show-emailQuentin Neill2015-06-013-1/+73
| | |_|_|_|_|/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/do-not-feed-tags-to-clear-commit-marks'Junio C Hamano2015-06-242-6/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | format-patch: do not feed tags to clear_commit_marks()jc/do-not-feed-tags-to-clear-commit-marksJunio C Hamano2015-06-012-6/+14
| | |_|_|_|_|/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'es/send-email-sendmail-alias'Junio C Hamano2015-06-243-46/+98
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | send-email: further warn about unsupported sendmail aliases featureses/send-email-sendmail-aliasEric Sunshine2015-06-011-0/+4
| * | | | | | | | | | | | | | | | | | | | | | | | | | t9001: add sendmail aliases line continuation testsEric Sunshine2015-06-011-0/+34
| * | | | | | | | | | | | | | | | | | | | | | | | | | t9001: refactor sendmail aliases test infrastructureEric Sunshine2015-06-011-18/+29
| * | | | | | | | | | | | | | | | | | | | | | | | | | send-email: implement sendmail aliases line continuation supportEric Sunshine2015-06-012-5/+7
| * | | | | | | | | | | | | | | | | | | | | | | | | | send-email: simplify sendmail aliases comment and blank line recognizerEric Sunshine2015-06-011-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | send-email: refactor sendmail aliases parserEric Sunshine2015-06-011-14/+24
| * | | | | | | | | | | | | | | | | | | | | | | | | | send-email: fix style: cuddle 'elsif' and 'else' with closing braceEric Sunshine2015-06-011-12/+5
| * | | | | | | | | | | | | | | | | | | | | | | | | | send-email: drop noise comments which merely repeat what code saysEric Sunshine2015-06-011-5/+0
| * | | | | | | | | | | | | | | | | | | | | | | | | | send-email: visually distinguish sendmail aliases parser warningsEric Sunshine2015-06-011-3/+3
| * | | | | | | | | | | | | | | | | | | | | | | | | | send-email: further document missing sendmail aliases functionalityEric Sunshine2015-06-011-0/+3
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/apply-reject-noop-hunk'Junio C Hamano2015-06-242-0/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | apply: reject a hunk that does not do anythingjc/apply-reject-noop-hunkJunio C Hamano2015-06-012-0/+16
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | git-multimail: update to release 1.1.0Matthieu Moy2015-06-186-326/+1017
* | | | | | | | | | | | | | | | | | | | | | | | | | | Eighth batch for 2.5Junio C Hamano2015-06-161-1/+11