summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* doc: core.ignoreStat update, and clarify the --assume-unchanged effectpo/doc-core-ignorestatPhilip Oakley2015-01-121-9/+13
* doc: core.ignoreStat clarify the --assume-unchanged effectPhilip Oakley2014-12-121-4/+5
* Second batch for 2.3 cycleJunio C Hamano2014-12-121-0/+18
* Merge branch 'jk/pack-bitmap'Junio C Hamano2014-12-124-18/+29
|\
| * pack-bitmap: do not use gcc packed attributeKarsten Blees2014-11-304-18/+29
* | Merge branch 'jk/push-simple'Junio C Hamano2014-12-122-6/+34
|\ \
| * | push: truly use "simple" as default, not "upstream"jk/push-simpleJeff King2014-11-302-6/+34
* | | Merge branch 'da/difftool-mergetool-simplify-reporting-status'Junio C Hamano2014-12-126-29/+12
|\ \ \
| * | | mergetools: stop setting $status in merge_cmd()da/difftool-mergetool-simplify-reporting-statusDavid Aguilar2014-11-213-3/+0
| * | | mergetool: simplify conditionalsDavid Aguilar2014-11-211-11/+5
| * | | difftool--helper: add explicit exit statementDavid Aguilar2014-11-211-0/+2
| * | | mergetool--lib: remove use of $status globalDavid Aguilar2014-11-211-14/+5
| * | | mergetool--lib: remove no-op assignment to $status from setup_user_toolJunio C Hamano2014-11-211-1/+0
* | | | Merge branch 'jk/colors-fix'Junio C Hamano2014-12-123-14/+25
|\ \ \ \
| * | | | t4026: test "normal" colorjk/colors-fixJeff King2014-11-201-0/+8
| * | | | config: fix parsing of "git config --get-color some.key -1"Jeff King2014-11-201-14/+13
| * | | | docs: describe ANSI 256-color modeJeff King2014-11-201-0/+4
* | | | | Merge branch 'rt/push-recurse-submodule-usage-string'Junio C Hamano2014-12-121-1/+1
|\ \ \ \ \
| * | | | | builtin/push.c: fix description of --recurse-submodules optionrt/push-recurse-submodule-usage-stringRalf Thielow2014-11-181-1/+1
* | | | | | Merge branch 'jk/rebuild-perl-scripts-with-no-perl-seting-change'Junio C Hamano2014-12-121-4/+10
|\ \ \ \ \ \
| * | | | | | Makefile: have python scripts depend on NO_PYTHON settingjk/rebuild-perl-scripts-with-no-perl-seting-changeJonathan Nieder2014-11-181-0/+3
| * | | | | | Makefile: simplify by using SCRIPT_{PERL,SH}_GEN macrosJonathan Nieder2014-11-181-5/+5
| * | | | | | Makefile: have perl scripts depend on NO_PERL settingJeff King2014-11-181-0/+3
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'jk/no-perl-tests'Junio C Hamano2014-12-123-4/+4
|\ \ \ \ \ \
| * | | | | | t960[34]: mark cvsimport tests as requiring perljk/no-perl-testsJeff King2014-11-182-3/+3
| * | | | | | t0090: mark add-interactive test with PERL prerequisiteJeff King2014-11-181-1/+1
* | | | | | | Merge branch 'sv/typofix-apply-error-message'Junio C Hamano2014-12-121-1/+1
|\ \ \ \ \ \ \
| * | | | | | | apply: fix typo in an error messagesv/typofix-apply-error-messageSlavomir Vlcek2014-11-171-1/+1
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'po/everyday-doc'Junio C Hamano2014-12-121-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Documentation: change "gitlink" typo in git-pushpo/everyday-docbrian m. carlson2014-11-171-1/+1
* | | | | | | | Merge branch 'mh/config-copy-string-from-git-path'Junio C Hamano2014-12-121-2/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | cmd_config(): make a copy of path obtained from git_path()mh/config-copy-string-from-git-pathMichael Haggerty2014-11-171-2/+5
* | | | | | | | | Merge branch 'jc/unpack-trees-plug-leak'Junio C Hamano2014-12-121-0/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | unpack_trees: plug leakage of o->resultjc/unpack-trees-plug-leakJunio C Hamano2014-11-171-0/+2
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | First batch for 2.3 cycleJunio C Hamano2014-12-052-1/+57
* | | | | | | | | Merge branch 'mh/config-flip-xbit-back-after-checking'Junio C Hamano2014-12-052-1/+9
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | create_default_files(): don't set u+x bit on $GIT_DIR/configmh/config-flip-xbit-back-after-checkingMichael Haggerty2014-11-182-1/+9
* | | | | | | | | | Merge branch 'jk/gitweb-with-newer-cgi-multi-param'Junio C Hamano2014-12-051-1/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | gitweb: hack around CGI's list-context param() handlingjk/gitweb-with-newer-cgi-multi-paramJeff King2014-11-181-1/+5
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'rs/receive-pack-use-labs'Junio C Hamano2014-12-051-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | use labs() for variables of type long instead of abs()rs/receive-pack-use-labsRené Scharfe2014-11-171-1/+1
* | | | | | | | | | | Merge branch 'rs/maint-config-use-labs'Junio C Hamano2014-12-051-2/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | use labs() for variables of type long instead of abs()rs/maint-config-use-labsRené Scharfe2014-11-171-2/+2
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'js/windows-open-eisdir-error'Junio C Hamano2014-12-051-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Windows: correct detection of EISDIR in mingw_open()js/windows-open-eisdir-errorJohannes Sixt2014-11-171-1/+1
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'jh/empty-notes'Junio C Hamano2014-12-054-825/+789
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | t3301: modernize styleJohan Herland2014-11-141-699/+601
| * | | | | | | | | | | notes: empty notes should be shown by 'git log'Johan Herland2014-11-122-2/+13
| * | | | | | | | | | | builtin/notes: add --allow-empty, to allow storing empty notesJohan Herland2014-11-123-11/+28
| * | | | | | | | | | | builtin/notes: split create_note() to clarify add vs. remove logicJohan Herland2014-11-121-49/+54