summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2014-11-21mergetool: simplify conditionalsLibravatar David Aguilar1-11/+5
2014-11-21difftool--helper: add explicit exit statementLibravatar David Aguilar1-0/+2
2014-11-21mergetool--lib: remove use of $status globalLibravatar David Aguilar1-14/+5
2014-11-21mergetool--lib: remove no-op assignment to $status from setup_user_toolLibravatar Junio C Hamano1-1/+0
2014-11-21init-db: improve the filemode trustability checkLibravatar Torsten Bögershausen1-0/+2
2014-11-21add: ignore only ignored filesLibravatar Michael J Gruber2-2/+8
2014-11-20diff-highlight: allow configurable colorsLibravatar Jeff King2-13/+90
2014-11-20parse_color: recognize "no$foo" to clear the $foo attributeLibravatar Jeff King4-6/+20
2014-11-20parse_color: support 24-bit RGB valuesLibravatar Jeff King4-5/+37
2014-11-20parse_color: refactor color storageLibravatar Jeff King1-32/+106
2014-11-20Merge branch 'jn/parse-config-slot' into jk/colorsLibravatar Junio C Hamano13-50/+47
2014-11-20t4026: test "normal" colorLibravatar Jeff King1-0/+8
2014-11-20config: fix parsing of "git config --get-color some.key -1"Libravatar Jeff King1-14/+13
2014-11-20docs: describe ANSI 256-color modeLibravatar Jeff King1-0/+4
2014-11-20lock_ref_sha1_basic: do not die on locking errorsLibravatar Ronnie Sahlberg1-2/+8
2014-11-20l10n: remove a superfluous translation for push.cLibravatar Jiang Xin6-30/+6
2014-11-20l10n: de.po: translate 2 messagesLibravatar Ralf Thielow1-3/+1
2014-11-20l10n: de.po: translate 2 new messagesLibravatar Ralf Thielow1-2/+2
2014-11-20l10n: batch updates for one trivial changeLibravatar Jiang Xin7-519/+554
2014-11-20l10n: git.pot: v2.2.0 round 2 (1 updated)Libravatar Jiang Xin1-24/+24
2014-11-19Merge branch 'sv/submitting-final-patch'Libravatar Junio C Hamano1-1/+1
2014-11-19Merge branch 'sn/tutorial-status-output-example'Libravatar Junio C Hamano2-19/+21
2014-11-19Merge branch 'mh/doc-remote-helper-xref'Libravatar Junio C Hamano5-0/+22
2014-11-19Merge branch 'tb/no-relative-file-url'Libravatar Junio C Hamano1-1/+1
2014-11-19Merge branch 'cc/interpret-trailers'Libravatar Junio C Hamano1-4/+10
2014-11-18gitweb: hack around CGI's list-context param() handlingLibravatar Jeff King1-1/+5
2014-11-18builtin/push.c: fix description of --recurse-submodules optionLibravatar Ralf Thielow1-1/+1
2014-11-18Makefile: have python scripts depend on NO_PYTHON settingLibravatar Jonathan Nieder1-0/+3
2014-11-18Makefile: simplify by using SCRIPT_{PERL,SH}_GEN macrosLibravatar Jonathan Nieder1-5/+5
2014-11-18Merge git://github.com/git-l10n/git-poLibravatar Junio C Hamano1-2165/+2392
2014-11-18Merge branch 'jc/doc-commit-only'Libravatar Junio C Hamano1-2/+3
2014-11-18Merge branch 'ta/tutorial-modernize'Libravatar Junio C Hamano1-1/+1
2014-11-18Merge branch 'da/difftool'Libravatar Junio C Hamano2-0/+6
2014-11-18t960[34]: mark cvsimport tests as requiring perlLibravatar Jeff King2-3/+3
2014-11-18t0090: mark add-interactive test with PERL prerequisiteLibravatar Jeff King1-1/+1
2014-11-18Makefile: have perl scripts depend on NO_PERL settingLibravatar Jeff King1-0/+3
2014-11-18create_default_files(): don't set u+x bit on $GIT_DIR/configLibravatar Michael Haggerty2-1/+9
2014-11-17l10n: Update Catalan translationLibravatar Alex Henrie1-2165/+2392
2014-11-17unpack_trees: plug leakage of o->resultLibravatar Junio C Hamano1-0/+2
2014-11-17Merge branch 'master' of git://github.com/git-l10n/git-poLibravatar Junio C Hamano1-1990/+2239
2014-11-17Documentation: change "gitlink" typo in git-pushLibravatar brian m. carlson1-1/+1
2014-11-17apply: fix typo in an error messageLibravatar Slavomir Vlcek1-1/+1
2014-11-17cmd_config(): make a copy of path obtained from git_path()Libravatar Michael Haggerty1-2/+5
2014-11-17use labs() for variables of type long instead of abs()Libravatar René Scharfe1-1/+1
2014-11-17use labs() for variables of type long instead of abs()Libravatar René Scharfe1-2/+2
2014-11-17Windows: correct detection of EISDIR in mingw_open()Libravatar Johannes Sixt1-1/+1
2014-11-15l10n: de.po: translate 62 new messagesLibravatar Ralf Thielow1-1414/+1663
2014-11-15l10n: de.po: Fixup one translationLibravatar Stefan Beller1-4/+4
2014-11-14difftool: honor --trust-exit-code for builtin toolsLibravatar David Aguilar2-0/+6
2014-11-14t3301: modernize styleLibravatar Johan Herland1-699/+601