aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'rs/apply-inaccurate-eof-with-incomplete-line'Junio C Hamano2017-11-27
|\
| * apply: update line lengths for --inaccurate-eofRené Scharfe2017-11-17
* | Merge branch 'pw/sequencer-recover-from-unlockable-index'Junio C Hamano2017-11-27
|\ \
| * | sequencer: reschedule pick if index can't be lockedPhillip Wood2017-11-16
* | | Merge branch 'sd/branch-copy'Junio C Hamano2017-11-27
|\ \ \
| * | | config: avoid "write_in_full(fd, buf, len) != len" patternPhillip Wood2017-11-16
* | | | Merge branch 'sb/test-cherry-pick-submodule-getting-in-a-way'Junio C Hamano2017-11-27
|\ \ \ \
| * | | | merge-recursive: handle addition of submodule on our side of historyElijah Newren2017-11-15
| * | | | t/3512: demonstrate unrelated submodule/file conflict as cherry-pick failureStefan Beller2017-11-12
* | | | | Merge branch 'tz/notes-error-to-stderr'Junio C Hamano2017-11-27
|\ \ \ \ \
| * | | | | notes: send "Automatic notes merge failed" messages to stderrTodd Zullinger2017-11-15
| | |_|_|/ | |/| | |
* | | | | Merge branch 'tz/redirect-fix'Junio C Hamano2017-11-27
|\ \ \ \ \
| * | | | | rebase: fix stderr redirect in apply_autostash()Todd Zullinger2017-11-14
| * | | | | t/lib-gpg: fix gpgconf stderr redirect to /dev/nullTodd Zullinger2017-11-14
* | | | | | Merge branch 'rv/sendemail-tocmd-in-config-and-completion'Junio C Hamano2017-11-27
|\ \ \ \ \ \
| * | | | | | completion: add git config sendemail.tocmdRasmus Villemoes2017-11-14
| * | | | | | Documentation/config: add sendemail.tocmd to list preceding "See git-send-ema...Rasmus Villemoes2017-11-14
* | | | | | | Merge branch 'jc/merge-base-fork-point-doc'Junio C Hamano2017-11-27
|\ \ \ \ \ \ \
| * | | | | | | merge-base --fork-point doc: clarify the example and failure modesJunio C Hamano2017-11-09
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'jc/ignore-cr-at-eol'Junio C Hamano2017-11-27
|\ \ \ \ \ \ \
| * | | | | | | diff: --ignore-cr-at-eolJunio C Hamano2017-11-08
| * | | | | | | xdiff: reassign xpparm_t.flags bitsJunio C Hamano2017-10-27
* | | | | | | | Sync with maintJunio C Hamano2017-11-21
|\ \ \ \ \ \ \ \
| * | | | | | | | Almost ready for 2.15.1Junio C Hamano2017-11-21
| * | | | | | | | Merge branch 'rs/sequencer-rewrite-file-cleanup' into maintJunio C Hamano2017-11-21
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'cb/t4201-robustify' into maintJunio C Hamano2017-11-21
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'tz/fsf-address-update' into maintJunio C Hamano2017-11-21
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'ad/rebase-i-serie-typofix' into maintJunio C Hamano2017-11-21
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/info-alternates-fix' into maintJunio C Hamano2017-11-21
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ab/pcre-v2' into maintJunio C Hamano2017-11-21
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sr/wrapper-quote-filenames' into maintJunio C Hamano2017-11-21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bw/rebase-i-ignored-submodule-fix' into maintJunio C Hamano2017-11-21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | RelNotes: the fifth batch for 2.16Junio C Hamano2017-11-21
* | | | | | | | | | | | | | | | Merge branch 'rs/apply-fuzzy-match-fix'Junio C Hamano2017-11-21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | apply: avoid out-of-bounds access in fuzzy_matchlines()René Scharfe2017-11-12
* | | | | | | | | | | | | | | | | Merge branch 'ad/submitting-patches-title-decoration'Junio C Hamano2017-11-21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | doc/SubmittingPatches: correct subject guidanceAdam Dinwoodie2017-11-11
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'av/fsmonitor'Junio C Hamano2017-11-21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | fsmonitor: simplify determining the git worktree under WindowsBen Peart2017-11-13
| * | | | | | | | | | | | | | | | | fsmonitor: store fsmonitor bitmap before splitting indexAlex Vandiver2017-11-10
| * | | | | | | | | | | | | | | | | fsmonitor: read from getcwd(), not the PWD environment variableAlex Vandiver2017-11-10
| * | | | | | | | | | | | | | | | | fsmonitor: delay updating state until after split index is mergedAlex Vandiver2017-11-01
| * | | | | | | | | | | | | | | | | fsmonitor: document GIT_TRACE_FSMONITORAlex Vandiver2017-10-30
| * | | | | | | | | | | | | | | | | fsmonitor: don't bother pretty-printing JSON from watchmanAlex Vandiver2017-10-30
| * | | | | | | | | | | | | | | | | fsmonitor: set the PWD to the top of the working treeAlex Vandiver2017-10-30
* | | | | | | | | | | | | | | | | | Merge branch 'bp/fsmonitor'Junio C Hamano2017-11-21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | fsmonitor: preserve utf8 filenames in fsmonitor-watchman logBen Peart2017-10-05
| * | | | | | | | | | | | | | | | | fsmonitor: read entirety of watchman outputAlex Vandiver2017-10-04
| * | | | | | | | | | | | | | | | | fsmonitor: MINGW support for watchman integrationBen Peart2017-10-04
| * | | | | | | | | | | | | | | | | fsmonitor: add a performance testBen Peart2017-10-01