summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* git{,-blame}.el: remove old bitrotting Emacs codeab/nuke-emacs-contribÆvar Arnfjörð Bjarmason2018-03-135-2228/+13
* Eighth batch for 2.17Junio C Hamano2018-03-081-5/+40
* Merge branch 'ag/userdiff-go-funcname'Junio C Hamano2018-03-088-0/+37
|\
| * userdiff: add built-in pattern for golangag/userdiff-go-funcnameAlban Gruin2018-03-018-0/+37
* | Merge branch 'ab/gc-auto-in-commit'Junio C Hamano2018-03-081-0/+2
|\ \
| * | commit: run git gc --auto just before the post-commit hookab/gc-auto-in-commitÆvar Arnfjörð Bjarmason2018-03-011-0/+2
* | | Merge branch 'bp/untracked-cache-noflush'Junio C Hamano2018-03-082-2/+16
|\ \ \
| * | | untracked cache: use git_env_bool() not getenv() for customizationbp/untracked-cache-noflushJunio C Hamano2018-02-282-4/+14
| * | | dir.c: don't flag the index as dirty for changes to the untracked cacheBen Peart2018-02-052-1/+5
* | | | Merge branch 'rs/perf-repeat-thrice-by-default'Junio C Hamano2018-03-081-5/+3
|\ \ \ \
| * | | | perf: use GIT_PERF_REPEAT_COUNT=3 by default even without config filers/perf-repeat-thrice-by-defaultRené Scharfe2018-02-271-5/+3
* | | | | Merge branch 'mk/doc-pretty-fill'Junio C Hamano2018-03-081-1/+1
|\ \ \ \ \
| * | | | | docs/pretty-formats: fix typo '% <(<N>)' -> '%<|(<N>)'mk/doc-pretty-fillMårten Kongstad2018-02-271-1/+1
* | | | | | Merge branch 'jc/test-must-be-empty'Junio C Hamano2018-03-081-1/+5
|\ \ \ \ \ \
| * | | | | | test_must_be_empty: make sure the file exists, not just emptyJunio C Hamano2018-02-271-1/+5
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'ds/mark-parents-uninteresting-optim'Junio C Hamano2018-03-081-1/+2
|\ \ \ \ \ \
| * | | | | | revision.c: reduce object database queriesds/mark-parents-uninteresting-optimDerrick Stolee2018-02-271-1/+2
* | | | | | | Merge branch 'ds/find-unique-abbrev-optim'Junio C Hamano2018-03-081-7/+7
|\ \ \ \ \ \ \
| * | | | | | | sha1_name: fix uninitialized memory errorsds/find-unique-abbrev-optimDerrick Stolee2018-02-271-7/+7
* | | | | | | | Merge branch 'sg/subtree-signed-commits'Junio C Hamano2018-03-081-6/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | subtree: fix add and pull for GPG-signed commitssg/subtree-signed-commitsStephen R Guglielmo2018-02-231-6/+6
* | | | | | | | | Merge branch 'rv/grep-cleanup'Junio C Hamano2018-03-081-13/+20
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | grep: simplify grep_oid and grep_filerv/grep-cleanupRasmus Villemoes2018-02-231-4/+2
| * | | | | | | | | grep: move grep_source_init outside critical sectionRasmus Villemoes2018-02-231-9/+18
| |/ / / / / / / /
* | | | | | | | | Merge branch 'ot/ref-filter-cleanup'Junio C Hamano2018-03-081-27/+24
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | ref-filter: get rid of gotoot/ref-filter-cleanupOlga Telezhnaya2018-02-211-3/+3
| * | | | | | | | | ref-filter: get rid of duplicate codeOlga Telezhnaya2018-02-211-24/+21
* | | | | | | | | | Merge branch 'jh/status-no-ahead-behind'Junio C Hamano2018-03-0810-35/+196
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | status: support --no-ahead-behind in long formatjh/status-no-ahead-behindJeff Hostetler2018-01-245-8/+46
| * | | | | | | | | | status: update short status to respect --no-ahead-behindJeff Hostetler2018-01-242-4/+20
| * | | | | | | | | | status: add --[no-]ahead-behind to status and commit for V2 format.Jeff Hostetler2018-01-247-11/+102
| * | | | | | | | | | stat_tracking_info: return +1 when branches not equalJeff Hostetler2018-01-244-20/+36
* | | | | | | | | | | Merge branch 'sg/travis-build-during-script-phase'Junio C Hamano2018-03-083-15/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | travis-ci: build Git during the 'script' phasesg/travis-build-during-script-phaseSZEDER Gábor2018-01-083-15/+4
* | | | | | | | | | | | Seventh batch for 2.17Junio C Hamano2018-03-061-0/+50
* | | | | | | | | | | | Merge branch 'bw/perl-timegm-timelocal-fix'Junio C Hamano2018-03-064-4/+8
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | perl: call timegm and timelocal with 4-digit yearbw/perl-timegm-timelocal-fixBernhard M. Wiedemann2018-02-234-4/+8
| | |_|_|/ / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'jk/strbuf-read-file-close-error'Junio C Hamano2018-03-061-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | strbuf_read_file(): preserve errno across close() calljk/strbuf-read-file-close-errorJeff King2018-02-231-1/+5
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'bw/c-plus-plus'Junio C Hamano2018-03-0663-662/+663
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | replace: rename 'new' variablesbw/c-plus-plusBrandon Williams2018-02-221-17/+17
| * | | | | | | | | | | | trailer: rename 'template' variablesBrandon Williams2018-02-221-5/+5
| * | | | | | | | | | | | tempfile: rename 'template' variablesBrandon Williams2018-02-222-23/+23
| * | | | | | | | | | | | wrapper: rename 'template' variablesBrandon Williams2018-02-222-22/+22
| * | | | | | | | | | | | environment: rename 'namespace' variablesBrandon Williams2018-02-221-5/+5
| * | | | | | | | | | | | diff: rename 'template' variablesBrandon Williams2018-02-221-5/+5
| * | | | | | | | | | | | environment: rename 'template' variablesBrandon Williams2018-02-222-8/+8
| * | | | | | | | | | | | init-db: rename 'template' variablesBrandon Williams2018-02-221-15/+15
| * | | | | | | | | | | | unpack-trees: rename 'new' variablesBrandon Williams2018-02-221-3/+3
| * | | | | | | | | | | | trailer: rename 'new' variablesBrandon Williams2018-02-221-17/+17
View Lorry Controller Status