Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | | | | | | | | | | am --skip: support skipping while on unborn branch | Paul Tan | 2015-06-08 | 2 | -3/+11 | |
| * | | | | | | | | | | | | | | | | | | | | am -3: support 3way merge on unborn branch | Paul Tan | 2015-06-08 | 2 | -1/+11 | |
| * | | | | | | | | | | | | | | | | | | | | am --skip: revert changes introduced by failed 3way merge | Paul Tan | 2015-06-08 | 2 | -1/+17 | |
| | |_|_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/untracked-cache' | Junio C Hamano | 2015-06-24 | 1 | -1/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | read-cache: fix untracked cache invalidation when split-index is usednd/untracked-cache | Nguyễn Thái Ngọc Duy | 2015-06-08 | 1 | -1/+2 | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'mh/fsck-reflog-entries' | Junio C Hamano | 2015-06-24 | 1 | -14/+20 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | fsck: report errors if reflog entries point at invalid objectsmh/fsck-reflog-entries | Michael Haggerty | 2015-06-08 | 1 | -4/+9 | |
| * | | | | | | | | | | | | | | | | | | | | | fsck_handle_reflog_sha1(): new function | Michael Haggerty | 2015-06-08 | 1 | -14/+15 | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/sleep-without-select' | Junio C Hamano | 2015-06-24 | 4 | -23/+16 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | lockfile: wait using sleep_millisec() instead of select()js/sleep-without-select | Johannes Sixt | 2015-06-05 | 1 | -9/+1 | |
| * | | | | | | | | | | | | | | | | | | | | | | lockfile: convert retry timeout computations to millisecond | Johannes Sixt | 2015-06-05 | 1 | -13/+8 | |
| * | | | | | | | | | | | | | | | | | | | | | | help.c: wrap wait-only poll() invocation in sleep_millisec() | Johannes Sixt | 2015-06-05 | 3 | -1/+7 | |
| * | | | | | | | | | | | | | | | | | | | | | | lockfile: replace random() by rand() | Johannes Sixt | 2015-06-05 | 1 | -2/+2 | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'es/utf8-stupid-compiler-workaround' | Junio C Hamano | 2015-06-24 | 1 | -1/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | utf8: NO_ICONV: silence uninitialized variable warninges/utf8-stupid-compiler-workaround | Eric Sunshine | 2015-06-05 | 1 | -1/+3 | |
| | |_|_|_|/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rl/am-3way-config' | Junio C Hamano | 2015-06-24 | 4 | -17/+53 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | git-am: add am.threeWay config variablerl/am-3way-config | Remi Lespinet | 2015-06-04 | 4 | -2/+41 | |
| * | | | | | | | | | | | | | | | | | | | | | | | t4150-am: refactor am -3 tests | Remi Lespinet | 2015-06-04 | 1 | -15/+11 | |
| * | | | | | | | | | | | | | | | | | | | | | | | git-am.sh: fix initialization of the threeway variable | Remi Lespinet | 2015-06-04 | 1 | -0/+1 | |
| | |_|/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/ll-merge-expose-path' | Junio C Hamano | 2015-06-24 | 3 | -8/+21 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | ll-merge: pass the original path to external driversjc/ll-merge-expose-path | Junio C Hamano | 2015-06-04 | 3 | -8/+21 | |
| | |_|_|_|/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'es/osx-header-pollutes-mask-macro' | Junio C Hamano | 2015-06-24 | 4 | -29/+29 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | ewah: use less generic macro namees/osx-header-pollutes-mask-macro | Jeff King | 2015-06-03 | 4 | -23/+23 | |
| * | | | | | | | | | | | | | | | | | | | | | | | ewah/bitmap: silence warning about MASK macro redefinition | Eric Sunshine | 2015-06-03 | 1 | -8/+8 | |
| | |_|/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'es/configure-getdelim' | Junio C Hamano | 2015-06-24 | 2 | -0/+9 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | configure: add getdelim() checkes/configure-getdelim | Eric Sunshine | 2015-06-03 | 1 | -0/+6 | |
| * | | | | | | | | | | | | | | | | | | | | | | | config.mak.uname: Darwin: define HAVE_GETDELIM for modern OS X releases | Eric Sunshine | 2015-06-03 | 1 | -0/+3 | |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'pt/pull-optparse' | Junio C Hamano | 2015-06-24 | 4 | -43/+122 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | pull: use git-rev-parse --parseopt for option parsingpt/pull-optparse | Paul Tan | 2015-06-02 | 1 | -40/+57 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | pull: handle git-fetch's options as well | Paul Tan | 2015-06-02 | 4 | -6/+68 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'pt/pull-tests' into pt/pull-optparse | Junio C Hamano | 2015-06-02 | 2 | -36/+175 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'qn/blame-show-email' | Junio C Hamano | 2015-06-24 | 3 | -1/+73 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | blame: add blame.showEmail configurationqn/blame-show-email | Quentin Neill | 2015-06-01 | 3 | -1/+73 | |
| | |_|_|_|_|/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/do-not-feed-tags-to-clear-commit-marks' | Junio C Hamano | 2015-06-24 | 2 | -6/+14 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | format-patch: do not feed tags to clear_commit_marks()jc/do-not-feed-tags-to-clear-commit-marks | Junio C Hamano | 2015-06-01 | 2 | -6/+14 | |
| | |_|_|_|_|/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'es/send-email-sendmail-alias' | Junio C Hamano | 2015-06-24 | 3 | -46/+98 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | send-email: further warn about unsupported sendmail aliases featureses/send-email-sendmail-alias | Eric Sunshine | 2015-06-01 | 1 | -0/+4 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | t9001: add sendmail aliases line continuation tests | Eric Sunshine | 2015-06-01 | 1 | -0/+34 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | t9001: refactor sendmail aliases test infrastructure | Eric Sunshine | 2015-06-01 | 1 | -18/+29 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | send-email: implement sendmail aliases line continuation support | Eric Sunshine | 2015-06-01 | 2 | -5/+7 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | send-email: simplify sendmail aliases comment and blank line recognizer | Eric Sunshine | 2015-06-01 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | send-email: refactor sendmail aliases parser | Eric Sunshine | 2015-06-01 | 1 | -14/+24 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | send-email: fix style: cuddle 'elsif' and 'else' with closing brace | Eric Sunshine | 2015-06-01 | 1 | -12/+5 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | send-email: drop noise comments which merely repeat what code says | Eric Sunshine | 2015-06-01 | 1 | -5/+0 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | send-email: visually distinguish sendmail aliases parser warnings | Eric Sunshine | 2015-06-01 | 1 | -3/+3 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | send-email: further document missing sendmail aliases functionality | Eric Sunshine | 2015-06-01 | 1 | -0/+3 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/apply-reject-noop-hunk' | Junio C Hamano | 2015-06-24 | 2 | -0/+16 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | apply: reject a hunk that does not do anythingjc/apply-reject-noop-hunk | Junio C Hamano | 2015-06-01 | 2 | -0/+16 | |
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | git-multimail: update to release 1.1.0 | Matthieu Moy | 2015-06-18 | 6 | -326/+1017 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Eighth batch for 2.5 | Junio C Hamano | 2015-06-16 | 1 | -1/+11 |