aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2014-11-20diff-highlight: allow configurable colorsJeff King2-13/+90
2014-11-20parse_color: recognize "no$foo" to clear the $foo attributeJeff King4-6/+20
2014-11-20parse_color: support 24-bit RGB valuesJeff King4-5/+37
2014-11-20parse_color: refactor color storageJeff King1-32/+106
2014-11-20Merge branch 'jn/parse-config-slot' into jk/colorsJunio C Hamano13-50/+47
2014-11-20t4026: test "normal" colorJeff King1-0/+8
2014-11-20config: fix parsing of "git config --get-color some.key -1"Jeff King1-14/+13
2014-11-20docs: describe ANSI 256-color modeJeff King1-0/+4
2014-11-12Merge branch 'nd/gitignore-trailing-whitespace' into maintJunio C Hamano1-1/+1
2014-11-11Merge branch 'rs/clean-menu-item-defn' into maintJunio C Hamano1-1/+1
2014-11-10Documentation/config.txt: fix minor typoThomas Quinot1-1/+1
2014-11-10config.txt: fix typoNicolas Dermine1-1/+1
2014-11-06docs/credential-store: s/--store/--file/Jeff King1-1/+1
2014-11-04gitignore.txt: fix spelling of "backslash"Ben North1-1/+1
2014-10-29Git 2.1.3v2.1.3Junio C Hamano4-3/+30
2014-10-29Merge branch 'jk/pack-objects-no-bitmap-when-splitting' into maintJunio C Hamano2-0/+10
2014-10-29Merge branch 'da/mergetool-meld' into maintJunio C Hamano2-2/+16
2014-10-29Merge branch 'rm/gitweb-start-form' into maintJunio C Hamano1-2/+2
2014-10-29Merge branch 'bc/asciidoc-pretty-formats-fix' into maintJunio C Hamano1-1/+1
2014-10-29Merge branch 'rs/daemon-fixes' into maintJunio C Hamano1-18/+15
2014-10-19pack-objects: turn off bitmaps when we split packsJeff King2-0/+10
2014-10-16gitweb: use start_form, not startform that was removed in CGI.pm 4.04Roland Mas1-2/+2
2014-10-16mergetools/meld: make usage of `--output` configurable and more robustDavid Aguilar2-2/+16
2014-10-14color_parse: do not mention variable name in error messageJeff King11-28/+26
2014-10-14pass config slots as pointers instead of offsetsJonathan Nieder5-22/+21
2014-10-08Documentation: fix misrender of pretty-formats in Asciidoctorbrian m. carlson1-1/+1
2014-10-07Merge branch 'maint-2.0' into maintJunio C Hamano1-1/+1
2014-10-07Merge branch 'maint-1.9' into maint-2.0Junio C Hamano1-1/+1
2014-10-07Merge branch 'maint-1.8.5' into maint-1.9Junio C Hamano1-1/+1
2014-10-07Merge branch 'jk/mbox-from-line' into maintJunio C Hamano6-1/+66
2014-10-07git-tag.txt: Add a missing hyphen to `-s`Wieland Hoffmann1-1/+1
2014-10-01daemon: remove write-only variable maxfdRené Scharfe1-4/+0
2014-10-01daemon: fix error message after bind()René Scharfe1-1/+1
2014-10-01daemon: handle gethostbyname() errorRené Scharfe1-13/+14
2014-09-29Git 2.1.2v2.1.2Junio C Hamano4-3/+24
2014-09-29Merge branch 'jk/fsck-exit-code-fix' into maintJunio C Hamano3-9/+87
2014-09-29Merge branch 'ta/config-add-to-empty-or-true-fix' into maintJunio C Hamano4-7/+41
2014-09-29Merge branch 'mk/reachable-protect-detached-head' into maintJunio C Hamano2-0/+25
2014-09-29Merge branch 'mb/fast-import-delete-root' into maintJunio C Hamano2-1/+109
2014-09-29Merge branch 'jk/index-pack-threading-races' into maintJunio C Hamano1-2/+31
2014-09-29Merge branch 'jk/send-pack-many-refspecs' into maintJunio C Hamano5-2/+153
2014-09-29Merge branch 'so/rebase-doc' into maintJunio C Hamano1-6/+3
2014-09-28Merge branch 'maint' of git://github.com/git-l10n/git-po into maintJunio C Hamano2-50/+51
2014-09-25l10n: de.po: use comma before "um"Phillip Sz1-43/+43
2014-09-25l10n: de.po: change Email to E-MailPhillip Sz1-7/+7
2014-09-25po/TEAMS: add new member to German translation teamRalf Thielow1-0/+1
2014-09-22mailinfo: work around -Wstring-plus-int warningEric Sunshine1-1/+2
2014-09-19Git 2.1.1v2.1.1Junio C Hamano4-3/+48
2014-09-19Merge branch 'et/spell-poll-infinite-with-minus-one-only' into maintJunio C Hamano1-1/+3
2014-09-19Merge branch 'nd/fetch-pass-quiet-to-gc-child-process' into maintJunio C Hamano1-4/+6