aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* strbuf.h: unify documentation comments beginningsStefan Beller2015-01-16
* strbuf.h: integrate api-strbuf.txt documentationJeff King2015-01-16
* Second batch for 2.3 cycleJunio C Hamano2014-12-12
* Merge branch 'jk/pack-bitmap'Junio C Hamano2014-12-12
|\
| * pack-bitmap: do not use gcc packed attributeKarsten Blees2014-11-30
* | Merge branch 'jk/push-simple'Junio C Hamano2014-12-12
|\ \
| * | push: truly use "simple" as default, not "upstream"Jeff King2014-11-30
* | | Merge branch 'da/difftool-mergetool-simplify-reporting-status'Junio C Hamano2014-12-12
|\ \ \
| * | | mergetools: stop setting $status in merge_cmd()David Aguilar2014-11-21
| * | | mergetool: simplify conditionalsDavid Aguilar2014-11-21
| * | | difftool--helper: add explicit exit statementDavid Aguilar2014-11-21
| * | | mergetool--lib: remove use of $status globalDavid Aguilar2014-11-21
| * | | mergetool--lib: remove no-op assignment to $status from setup_user_toolJunio C Hamano2014-11-21
* | | | Merge branch 'jk/colors-fix'Junio C Hamano2014-12-12
|\ \ \ \
| * | | | t4026: test "normal" colorJeff King2014-11-20
| * | | | config: fix parsing of "git config --get-color some.key -1"Jeff King2014-11-20
| * | | | docs: describe ANSI 256-color modeJeff King2014-11-20
* | | | | Merge branch 'rt/push-recurse-submodule-usage-string'Junio C Hamano2014-12-12
|\ \ \ \ \
| * | | | | builtin/push.c: fix description of --recurse-submodules optionRalf Thielow2014-11-18
* | | | | | Merge branch 'jk/rebuild-perl-scripts-with-no-perl-seting-change'Junio C Hamano2014-12-12
|\ \ \ \ \ \
| * | | | | | Makefile: have python scripts depend on NO_PYTHON settingJonathan Nieder2014-11-18
| * | | | | | Makefile: simplify by using SCRIPT_{PERL,SH}_GEN macrosJonathan Nieder2014-11-18
| * | | | | | Makefile: have perl scripts depend on NO_PERL settingJeff King2014-11-18
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'jk/no-perl-tests'Junio C Hamano2014-12-12
|\ \ \ \ \ \
| * | | | | | t960[34]: mark cvsimport tests as requiring perlJeff King2014-11-18
| * | | | | | t0090: mark add-interactive test with PERL prerequisiteJeff King2014-11-18
* | | | | | | Merge branch 'sv/typofix-apply-error-message'Junio C Hamano2014-12-12
|\ \ \ \ \ \ \
| * | | | | | | apply: fix typo in an error messageSlavomir Vlcek2014-11-17
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'po/everyday-doc'Junio C Hamano2014-12-12
|\ \ \ \ \ \ \
| * | | | | | | Documentation: change "gitlink" typo in git-pushbrian m. carlson2014-11-17
* | | | | | | | Merge branch 'mh/config-copy-string-from-git-path'Junio C Hamano2014-12-12
|\ \ \ \ \ \ \ \
| * | | | | | | | cmd_config(): make a copy of path obtained from git_path()Michael Haggerty2014-11-17
* | | | | | | | | Merge branch 'jc/unpack-trees-plug-leak'Junio C Hamano2014-12-12
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | unpack_trees: plug leakage of o->resultJunio C Hamano2014-11-17
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | First batch for 2.3 cycleJunio C Hamano2014-12-05
* | | | | | | | | Merge branch 'mh/config-flip-xbit-back-after-checking'Junio C Hamano2014-12-05
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | create_default_files(): don't set u+x bit on $GIT_DIR/configMichael Haggerty2014-11-18
* | | | | | | | | | Merge branch 'jk/gitweb-with-newer-cgi-multi-param'Junio C Hamano2014-12-05
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | gitweb: hack around CGI's list-context param() handlingJeff King2014-11-18
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'rs/receive-pack-use-labs'Junio C Hamano2014-12-05
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | use labs() for variables of type long instead of abs()René Scharfe2014-11-17
* | | | | | | | | | | Merge branch 'rs/maint-config-use-labs'Junio C Hamano2014-12-05
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | use labs() for variables of type long instead of abs()René Scharfe2014-11-17
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'js/windows-open-eisdir-error'Junio C Hamano2014-12-05
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Windows: correct detection of EISDIR in mingw_open()Johannes Sixt2014-11-17
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'jh/empty-notes'Junio C Hamano2014-12-05
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | t3301: modernize styleJohan Herland2014-11-14
| * | | | | | | | | | | notes: empty notes should be shown by 'git log'Johan Herland2014-11-12
| * | | | | | | | | | | builtin/notes: add --allow-empty, to allow storing empty notesJohan Herland2014-11-12
| * | | | | | | | | | | builtin/notes: split create_note() to clarify add vs. remove logicJohan Herland2014-11-12