Commit message (Expand) | Author | Age | |
---|---|---|---|
* | strbuf.h: unify documentation comments beginnings | Stefan Beller | 2015-01-16 |
* | strbuf.h: integrate api-strbuf.txt documentation | Jeff King | 2015-01-16 |
* | Second batch for 2.3 cycle | Junio C Hamano | 2014-12-12 |
* | Merge branch 'jk/pack-bitmap' | Junio C Hamano | 2014-12-12 |
|\ | |||
| * | pack-bitmap: do not use gcc packed attribute | Karsten Blees | 2014-11-30 |
* | | Merge branch 'jk/push-simple' | Junio C Hamano | 2014-12-12 |
|\ \ | |||
| * | | push: truly use "simple" as default, not "upstream" | Jeff King | 2014-11-30 |
* | | | Merge branch 'da/difftool-mergetool-simplify-reporting-status' | Junio C Hamano | 2014-12-12 |
|\ \ \ | |||
| * | | | mergetools: stop setting $status in merge_cmd() | David Aguilar | 2014-11-21 |
| * | | | mergetool: simplify conditionals | David Aguilar | 2014-11-21 |
| * | | | difftool--helper: add explicit exit statement | David Aguilar | 2014-11-21 |
| * | | | mergetool--lib: remove use of $status global | David Aguilar | 2014-11-21 |
| * | | | mergetool--lib: remove no-op assignment to $status from setup_user_tool | Junio C Hamano | 2014-11-21 |
* | | | | Merge branch 'jk/colors-fix' | Junio C Hamano | 2014-12-12 |
|\ \ \ \ | |||
| * | | | | t4026: test "normal" color | Jeff King | 2014-11-20 |
| * | | | | config: fix parsing of "git config --get-color some.key -1" | Jeff King | 2014-11-20 |
| * | | | | docs: describe ANSI 256-color mode | Jeff King | 2014-11-20 |
* | | | | | Merge branch 'rt/push-recurse-submodule-usage-string' | Junio C Hamano | 2014-12-12 |
|\ \ \ \ \ | |||
| * | | | | | builtin/push.c: fix description of --recurse-submodules option | Ralf Thielow | 2014-11-18 |
* | | | | | | Merge branch 'jk/rebuild-perl-scripts-with-no-perl-seting-change' | Junio C Hamano | 2014-12-12 |
|\ \ \ \ \ \ | |||
| * | | | | | | Makefile: have python scripts depend on NO_PYTHON setting | Jonathan Nieder | 2014-11-18 |
| * | | | | | | Makefile: simplify by using SCRIPT_{PERL,SH}_GEN macros | Jonathan Nieder | 2014-11-18 |
| * | | | | | | Makefile: have perl scripts depend on NO_PERL setting | Jeff King | 2014-11-18 |
| | |/ / / / | |/| | | | | |||
* | | | | | | Merge branch 'jk/no-perl-tests' | Junio C Hamano | 2014-12-12 |
|\ \ \ \ \ \ | |||
| * | | | | | | t960[34]: mark cvsimport tests as requiring perl | Jeff King | 2014-11-18 |
| * | | | | | | t0090: mark add-interactive test with PERL prerequisite | Jeff King | 2014-11-18 |
* | | | | | | | Merge branch 'sv/typofix-apply-error-message' | Junio C Hamano | 2014-12-12 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | apply: fix typo in an error message | Slavomir Vlcek | 2014-11-17 |
| | |_|/ / / / | |/| | | | | | |||
* | | | | | | | Merge branch 'po/everyday-doc' | Junio C Hamano | 2014-12-12 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | Documentation: change "gitlink" typo in git-push | brian m. carlson | 2014-11-17 |
* | | | | | | | | Merge branch 'mh/config-copy-string-from-git-path' | Junio C Hamano | 2014-12-12 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | cmd_config(): make a copy of path obtained from git_path() | Michael Haggerty | 2014-11-17 |
* | | | | | | | | | Merge branch 'jc/unpack-trees-plug-leak' | Junio C Hamano | 2014-12-12 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | unpack_trees: plug leakage of o->result | Junio C Hamano | 2014-11-17 |
| | |_|/ / / / / / | |/| | | | | | | | |||
* | | | | | | | | | First batch for 2.3 cycle | Junio C Hamano | 2014-12-05 |
* | | | | | | | | | Merge branch 'mh/config-flip-xbit-back-after-checking' | Junio C Hamano | 2014-12-05 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | create_default_files(): don't set u+x bit on $GIT_DIR/config | Michael Haggerty | 2014-11-18 |
* | | | | | | | | | | Merge branch 'jk/gitweb-with-newer-cgi-multi-param' | Junio C Hamano | 2014-12-05 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | gitweb: hack around CGI's list-context param() handling | Jeff King | 2014-11-18 |
| | |_|_|_|_|/ / / / | |/| | | | | | | | | |||
* | | | | | | | | | | Merge branch 'rs/receive-pack-use-labs' | Junio C Hamano | 2014-12-05 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | use labs() for variables of type long instead of abs() | René Scharfe | 2014-11-17 |
* | | | | | | | | | | | Merge branch 'rs/maint-config-use-labs' | Junio C Hamano | 2014-12-05 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | use labs() for variables of type long instead of abs() | René Scharfe | 2014-11-17 |
| | |/ / / / / / / / / | |/| | | | | | | | | | |||
* | | | | | | | | | | | Merge branch 'js/windows-open-eisdir-error' | Junio C Hamano | 2014-12-05 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | Windows: correct detection of EISDIR in mingw_open() | Johannes Sixt | 2014-11-17 |
| |/ / / / / / / / / / | |||
* | | | | | | | | | | | Merge branch 'jh/empty-notes' | Junio C Hamano | 2014-12-05 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | t3301: modernize style | Johan Herland | 2014-11-14 |
| * | | | | | | | | | | | notes: empty notes should be shown by 'git log' | Johan Herland | 2014-11-12 |
| * | | | | | | | | | | | builtin/notes: add --allow-empty, to allow storing empty notes | Johan Herland | 2014-11-12 |
| * | | | | | | | | | | | builtin/notes: split create_note() to clarify add vs. remove logic | Johan Herland | 2014-11-12 |