aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* parse_color: fix return value for numeric color values 0-8Jeff King2015-01-20
* parse_color: drop COLOR_BACKGROUND macroJeff King2014-12-09
* diff-highlight: allow configurable colorsJeff King2014-11-20
* parse_color: recognize "no$foo" to clear the $foo attributeJeff King2014-11-20
* parse_color: support 24-bit RGB valuesJeff King2014-11-20
* parse_color: refactor color storageJeff King2014-11-20
* Merge branch 'jn/parse-config-slot' into jk/colorsJunio C Hamano2014-11-20
|\
| * color_parse: do not mention variable name in error messageJeff King2014-10-14
| * pass config slots as pointers instead of offsetsJonathan Nieder2014-10-14
* | 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 'nd/gitignore-trailing-whitespace' into maintJunio C Hamano2014-11-12
|\ \
| * | gitignore.txt: fix spelling of "backslash"Ben North2014-11-04
* | | Merge branch 'rs/clean-menu-item-defn' into maintJunio C Hamano2014-11-11
|\ \ \
| * | | clean: use f(void) instead of f() to declare a pointer to a function without ...René Scharfe2014-08-18
* | | | Documentation/config.txt: fix minor typoThomas Quinot2014-11-10
* | | | config.txt: fix typoNicolas Dermine2014-11-10
* | | | docs/credential-store: s/--store/--file/Jeff King2014-11-06
* | | | Git 2.1.3v2.1.3Junio C Hamano2014-10-29
* | | | Merge branch 'jk/pack-objects-no-bitmap-when-splitting' into maintJunio C Hamano2014-10-29
|\ \ \ \
| * | | | pack-objects: turn off bitmaps when we split packsJeff King2014-10-19
* | | | | Merge branch 'da/mergetool-meld' into maintJunio C Hamano2014-10-29
|\ \ \ \ \
| * | | | | mergetools/meld: make usage of `--output` configurable and more robustDavid Aguilar2014-10-16
* | | | | | Merge branch 'rm/gitweb-start-form' into maintJunio C Hamano2014-10-29
|\ \ \ \ \ \
| * | | | | | gitweb: use start_form, not startform that was removed in CGI.pm 4.04Roland Mas2014-10-16
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'bc/asciidoc-pretty-formats-fix' into maintJunio C Hamano2014-10-29
|\ \ \ \ \ \
| * | | | | | Documentation: fix misrender of pretty-formats in Asciidoctorbrian m. carlson2014-10-08
* | | | | | | Merge branch 'rs/daemon-fixes' into maintJunio C Hamano2014-10-29
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | daemon: remove write-only variable maxfdRené Scharfe2014-10-01
| * | | | | | daemon: fix error message after bind()René Scharfe2014-10-01
| * | | | | | daemon: handle gethostbyname() errorRené Scharfe2014-10-01
* | | | | | | Merge branch 'maint-2.0' into maintJunio C Hamano2014-10-07
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Merge branch 'maint-1.9' into maint-2.0Junio C Hamano2014-10-07
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'maint-1.8.5' into maint-1.9Junio C Hamano2014-10-07
| | |\ \ \ \ \ \
| | | * | | | | | git-tag.txt: Add a missing hyphen to `-s`Wieland Hoffmann2014-10-07
| | | |/ / / / /
* | | | | | | | Merge branch 'jk/mbox-from-line' into maintJunio C Hamano2014-10-07
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | mailinfo: work around -Wstring-plus-int warningEric Sunshine2014-09-22
| * | | | | | | mailinfo: make ">From" in-body header check more robustJeff King2014-09-16
* | | | | | | | Git 2.1.2v2.1.2Junio C Hamano2014-09-29
* | | | | | | | Merge branch 'jk/fsck-exit-code-fix' into maintJunio C Hamano2014-09-29
|\ \ \ \ \ \ \ \
| * | | | | | | | fsck: return non-zero status on missing ref tipsJeff King2014-09-12
| * | | | | | | | fsck: exit with non-zero status upon error from fsck_obj()Jeff King2014-09-10
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'ta/config-add-to-empty-or-true-fix' into maintJunio C Hamano2014-09-29
|\ \ \ \ \ \ \ \
| * | | | | | | | config: avoid a funny sentinel value "a^"Jeff King2014-09-11
| * | | | | | | | make config --add behave correctly for empty and NULL valuesTanay Abhra2014-08-18
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'mk/reachable-protect-detached-head' into maintJunio C Hamano2014-09-29
|\ \ \ \ \ \ \ \
| * | | | | | | | reachable.c: add HEAD to reachability starting commitsMax Kirillov2014-09-03
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'mb/fast-import-delete-root' into maintJunio C Hamano2014-09-29
|\ \ \ \ \ \ \ \
| * | | | | | | | fast-import: fix segfault in store_tree()Maxim Bublis2014-08-29