Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | pretty: avoid adding reset for %C(auto) if output is emptyrs/c-auto-resets-attributes | René Scharfe | 2016-09-29 | 2 | -2/+2 |
* | pretty: let %C(auto) reset all attributes | René Scharfe | 2016-09-19 | 2 | -1/+3 |
* | format_commit_message: honor `color=auto` for `%C(auto)`et/pretty-format-c-auto | Edward Thomson | 2016-05-27 | 2 | -8/+20 |
* | Git 2.8.3v2.8.3 | Junio C Hamano | 2016-05-18 | 4 | -5/+37 |
* | Merge branch 'sb/misc-cleanups' into HEAD | Junio C Hamano | 2016-05-18 | 6 | -21/+29 |
|\ | |||||
| * | submodule-config: don't shadow `cache`sb/misc-cleanups | Stefan Beller | 2016-04-28 | 1 | -6/+6 |
| * | config.c: drop local variable | Stefan Beller | 2016-04-28 | 1 | -4/+1 |
| * | credential-cache, send_request: close fd when done | Stefan Beller | 2016-04-01 | 1 | -0/+1 |
| * | bundle: don't leak an fd in case of early return | Stefan Beller | 2016-04-01 | 1 | -6/+17 |
| * | abbrev_sha1_in_line: don't leak memory | Stefan Beller | 2016-04-01 | 1 | -3/+1 |
| * | notes: don't leak memory in git_config_get_notes_strategy | Stefan Beller | 2016-04-01 | 1 | -2/+3 |
* | | Merge branch 'ew/doc-split-pack-disables-bitmap' into HEAD | Junio C Hamano | 2016-05-18 | 4 | -9/+23 |
|\ \ | |||||
| * | | pack-objects: warn on split packs disabling bitmapsew/doc-split-pack-disables-bitmap | Eric Wong | 2016-04-28 | 4 | -9/+23 |
* | | | Merge branch 'sb/clean-test-fix' into HEAD | Junio C Hamano | 2016-05-18 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | t7300: mark test with SANITYsb/clean-test-fix | Stefan Beller | 2016-05-03 | 1 | -1/+1 |
* | | | | Merge branch 'rn/glossary-typofix' into HEAD | Junio C Hamano | 2016-05-18 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Documentation: fix typo 'In such these cases'rn/glossary-typofix | René Nyffenegger | 2016-05-02 | 1 | -1/+1 |
* | | | | | Merge branch 'ew/normal-to-e' into HEAD | Junio C Hamano | 2016-05-18 | 1 | -0/+1 |
|\ \ \ \ \ | |||||
| * | | | | | .mailmap: update to my shorter email addressew/normal-to-e | Eric Wong | 2016-05-02 | 1 | -0/+1 |
* | | | | | | Merge branch 'sb/config-exit-status-list' into HEAD | Junio C Hamano | 2016-05-18 | 1 | -3/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | config doc: improve exit code listingsb/config-exit-status-list | Stefan Beller | 2016-04-26 | 1 | -3/+3 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge branch 'rt/string-list-lookup-cleanup' into HEAD | Junio C Hamano | 2016-05-18 | 1 | -4/+4 |
|\ \ \ \ \ \ | |||||
| * | | | | | | string_list: use string-list API in unsorted_string_list_lookup()rt/string-list-lookup-cleanup | Ralf Thielow | 2016-04-25 | 1 | -4/+4 |
* | | | | | | | Merge branch 'jk/fix-attribute-macro-in-2.5' into HEAD | Junio C Hamano | 2016-05-18 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | remote.c: spell __attribute__ correctlyjk/fix-attribute-macro-in-2.5 | Jeff King | 2016-04-25 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'sg/test-lib-simplify-expr-away' into HEAD | Junio C Hamano | 2016-05-18 | 1 | -5/+5 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | test-lib: simplify '--option=value' parsingsg/test-lib-simplify-expr-away | SZEDER Gábor | 2016-04-22 | 1 | -5/+5 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'nd/remove-unused' into HEAD | Junio C Hamano | 2016-05-18 | 4 | -27/+0 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | wrapper.c: delete dead function git_mkstemps()nd/remove-unused | Nguyễn Thái Ngọc Duy | 2016-04-22 | 2 | -19/+0 |
| * | | | | | | | | dir.c: remove dead function fnmatch_icase() | Nguyễn Thái Ngọc Duy | 2016-04-22 | 2 | -8/+0 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'sk/gitweb-highlight-encoding' into HEAD | Junio C Hamano | 2016-05-18 | 1 | -0/+3 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | gitweb: apply fallback encoding before highlightsk/gitweb-highlight-encoding | Shin Kojima | 2016-05-03 | 1 | -0/+3 |
* | | | | | | | | | Merge branch 'ls/travis-submitting-patches' into HEAD | Junio C Hamano | 2016-05-18 | 1 | -17/+63 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Documentation: add setup instructions for Travis CIls/travis-submitting-patches | Lars Schneider | 2016-05-02 | 1 | -17/+63 |
* | | | | | | | | | | Merge branch 'js/close-packs-before-gc' into HEAD | Junio C Hamano | 2016-05-18 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | t5510: run auto-gc in the foregroundjs/close-packs-before-gc | SZEDER Gábor | 2016-05-02 | 1 | -0/+1 |
* | | | | | | | | | | | Merge branch 'ls/p4-lfs' into HEAD | Junio C Hamano | 2016-05-18 | 3 | -10/+24 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | git-p4: fix Git LFS pointer parsing | Lars Schneider | 2016-04-28 | 2 | -3/+14 |
| * | | | | | | | | | | | travis-ci: express Linux/OS X dependency versions more clearly | Lars Schneider | 2016-04-28 | 1 | -7/+10 |
| * | | | | | | | | | | | travis-ci: update Git-LFS and P4 to the latest version | Lars Schneider | 2016-04-19 | 1 | -2/+2 |
* | | | | | | | | | | | | Merge branch 'ls/p4-lfs-test-fix-2.7.0' into HEAD | Junio C Hamano | 2016-05-18 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | t9824: fix wrong reference valuels/p4-lfs-test-fix-2.7.0 | Lars Schneider | 2016-04-29 | 1 | -1/+1 |
| * | | | | | | | | | | | | t9824: fix broken &&-chain in a subshell | SZEDER Gábor | 2016-04-24 | 1 | -1/+1 |
* | | | | | | | | | | | | | Merge branch 'nf/mergetool-prompt' into HEAD | Junio C Hamano | 2016-05-18 | 4 | -5/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | difftool/mergetool: make the form of yes/no questions consistentnf/mergetool-prompt | Nikola Forró | 2016-04-25 | 4 | -5/+5 |
| | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge branch 'jd/send-email-to-whom' into HEAD | Junio C Hamano | 2016-05-18 | 1 | -2/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | send-email: fix grammo in the prompt that asks e-mail recipientsjd/send-email-to-whom | Junio C Hamano | 2016-04-25 | 1 | -2/+3 |
| | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge branch 'js/win32-mmap' into HEAD | Junio C Hamano | 2016-05-18 | 1 | -13/+18 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | mmap(win32): avoid expensive fstat() calljs/win32-mmap | Johannes Schindelin | 2016-04-22 | 1 | -9/+7 |
| * | | | | | | | | | | | | | mmap(win32): avoid copy-on-write when it is unnecessary | Johannes Schindelin | 2016-04-22 | 1 | -2/+3 |