Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Revert "diff-lib.c: adjust position of i-t-a entries in diff"nd/diff-i-t-a | Junio C Hamano | 2015-06-23 | 4 | -38/+8 |
* | diff-lib.c: adjust position of i-t-a entries in diff | Nguyễn Thái Ngọc Duy | 2015-03-23 | 4 | -8/+38 |
* | Sync with v2.3.4 | Junio C Hamano | 2015-03-23 | 2 | -1/+34 |
|\ | |||||
| * | Git 2.3.4v2.3.4 | Junio C Hamano | 2015-03-23 | 4 | -3/+36 |
| * | Merge branch 'rs/use-isxdigit' into maint | Junio C Hamano | 2015-03-23 | 2 | -2/+2 |
| |\ | |||||
| * \ | Merge branch 'rs/deflate-init-cleanup' into maint | Junio C Hamano | 2015-03-23 | 10 | -13/+2 |
| |\ \ | |||||
| * \ \ | Merge branch 'ak/git-done-help-cleanup' into maint | Junio C Hamano | 2015-03-23 | 1 | -3/+2 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'sg/completion-remote' into maint | Junio C Hamano | 2015-03-23 | 2 | -5/+21 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'mg/doc-status-color-slot' into maint | Junio C Hamano | 2015-03-23 | 2 | -2/+4 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'jc/decorate-leaky-separator-color' into maint | Junio C Hamano | 2015-03-23 | 3 | -57/+84 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'kn/git-cd-to-empty' into maint | Junio C Hamano | 2015-03-23 | 2 | -4/+16 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'km/imap-send-libcurl-options' into maint | Junio C Hamano | 2015-03-23 | 2 | -3/+17 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'mg/verify-commit' into maint | Junio C Hamano | 2015-03-23 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'es/rebase-i-count-todo' into maint | Junio C Hamano | 2015-03-23 | 2 | -1/+11 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'tb/connect-ipv6-parse-fix' into maint | Junio C Hamano | 2015-03-23 | 3 | -80/+144 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
* | | | | | | | | | | | | | Post 2.3 cycle (batch #12) | Junio C Hamano | 2015-03-23 | 1 | -15/+46 |
* | | | | | | | | | | | | | Merge branch 'js/completion-ctags-pattern-substitution-fix' | Junio C Hamano | 2015-03-23 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | contrib/completion: escape the forward slash in __git_match_ctagjs/completion-ctags-pattern-substitution-fix | John Szakmeister | 2015-03-14 | 1 | -1/+1 |
* | | | | | | | | | | | | | | Merge branch 'jk/push-config' | Junio C Hamano | 2015-03-23 | 4 | -9/+24 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | push: allow --follow-tags to be set by config push.followTagsjk/push-config | Dave Olszewski | 2015-03-14 | 4 | -1/+21 |
| * | | | | | | | | | | | | | | cmd_push: pass "flags" pointer to config callback | Jeff King | 2015-02-17 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | cmd_push: set "atomic" bit directly | Jeff King | 2015-02-17 | 1 | -5/+1 |
| * | | | | | | | | | | | | | | git_push_config: drop cargo-culted wt_status pointer | Jeff King | 2015-02-15 | 1 | -2/+1 |
* | | | | | | | | | | | | | | | Merge branch 'nd/config-doc-camelCase' | Junio C Hamano | 2015-03-23 | 37 | -212/+212 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | *config.txt: stick to camelCase naming conventionnd/config-doc-camelCase | Nguyễn Thái Ngọc Duy | 2015-03-13 | 37 | -212/+212 |
* | | | | | | | | | | | | | | | | Merge branch 'jk/test-annoyances' | Junio C Hamano | 2015-03-23 | 5 | -15/+24 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | t5551: make EXPENSIVE test cheaperjk/test-annoyances | Jeff King | 2015-03-12 | 1 | -5/+14 |
| * | | | | | | | | | | | | | | | | t5541: move run_with_cmdline_limit to test-lib.sh | Jeff King | 2015-03-12 | 2 | -6/+6 |
| * | | | | | | | | | | | | | | | | t: pass GIT_TRACE through Apache | Jeff King | 2015-03-12 | 2 | -0/+2 |
| * | | | | | | | | | | | | | | | | t: redirect stderr GIT_TRACE to descriptor 4 | Jeff King | 2015-03-12 | 1 | -4/+1 |
| * | | | | | | | | | | | | | | | | t: translate SIGINT to an exit | Jeff King | 2015-03-12 | 1 | -0/+1 |
* | | | | | | | | | | | | | | | | | Merge branch 'jk/smart-http-hide-refs' | Junio C Hamano | 2015-03-23 | 2 | -6/+21 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | upload-pack: do not check NULL return of lookup_unknown_objectjk/smart-http-hide-refs | Jeff King | 2015-03-12 | 1 | -2/+0 |
| * | | | | | | | | | | | | | | | | | upload-pack: fix transfer.hiderefs over smart-http | Jeff King | 2015-03-12 | 2 | -4/+21 |
* | | | | | | | | | | | | | | | | | | Merge branch 'jk/tag-h-column-is-a-listing-option' | Junio C Hamano | 2015-03-23 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | tag: fix some mis-organized options in "-h" listingjk/tag-h-column-is-a-listing-option | Jeff King | 2015-03-12 | 1 | -2/+2 |
* | | | | | | | | | | | | | | | | | | | Post 2.3 cycle (batch #11) | Junio C Hamano | 2015-03-20 | 1 | -0/+64 |
* | | | | | | | | | | | | | | | | | | | Merge branch 'mg/log-decorate-HEAD' | Junio C Hamano | 2015-03-20 | 3 | -13/+72 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | log: decorate HEAD with branch name | Junio C Hamano | 2015-03-10 | 3 | -13/+72 |
| * | | | | | | | | | | | | | | | | | | | Merge branch 'jc/decorate-leaky-separator-color' into HEAD | Junio C Hamano | 2015-03-10 | 3 | -57/+84 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | / / / / / / | | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | Merge branch 'jc/decorate-leaky-separator-color' | Junio C Hamano | 2015-03-20 | 3 | -57/+82 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | log --decorate: do not leak "commit" color into the next itemjc/decorate-leaky-separator-color | Junio C Hamano | 2015-03-04 | 3 | -8/+16 |
| * | | | | | | | | | | | | | | | | | | Documentation/config.txt: simplify boolean description in the syntax section | Junio C Hamano | 2015-03-04 | 1 | -2/+2 |
| * | | | | | | | | | | | | | | | | | | Documentation/config.txt: describe 'color' value type in the "Values" section | Junio C Hamano | 2015-03-04 | 1 | -16/+13 |
| * | | | | | | | | | | | | | | | | | | Documentation/config.txt: have a separate "Values" section | Junio C Hamano | 2015-03-04 | 1 | -8/+31 |
| * | | | | | | | | | | | | | | | | | | Documentation/config.txt: describe the structure first and then meaning | Junio C Hamano | 2015-03-04 | 1 | -16/+15 |
| * | | | | | | | | | | | | | | | | | | Documentation/config.txt: explain multi-valued variables once | Junio C Hamano | 2015-03-04 | 1 | -4/+3 |
| * | | | | | | | | | | | | | | | | | | Documentation/config.txt: avoid unnecessary negation | Junio C Hamano | 2015-03-04 | 1 | -3/+3 |
* | | | | | | | | | | | | | | | | | | | Merge branch 'sb/leaks' | Junio C Hamano | 2015-03-20 | 3 | -7/+8 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | builtin/help.c: fix memory leak | Stefan Beller | 2015-03-10 | 1 | -1/+2 |