summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Revert "diff-lib.c: adjust position of i-t-a entries in diff"nd/diff-i-t-aJunio C Hamano2015-06-234-38/+8
* diff-lib.c: adjust position of i-t-a entries in diffNguyễn Thái Ngọc Duy2015-03-234-8/+38
* Sync with v2.3.4Junio C Hamano2015-03-232-1/+34
|\
| * Git 2.3.4v2.3.4Junio C Hamano2015-03-234-3/+36
| * Merge branch 'rs/use-isxdigit' into maintJunio C Hamano2015-03-232-2/+2
| |\
| * \ Merge branch 'rs/deflate-init-cleanup' into maintJunio C Hamano2015-03-2310-13/+2
| |\ \
| * \ \ Merge branch 'ak/git-done-help-cleanup' into maintJunio C Hamano2015-03-231-3/+2
| |\ \ \
| * \ \ \ Merge branch 'sg/completion-remote' into maintJunio C Hamano2015-03-232-5/+21
| |\ \ \ \
| * \ \ \ \ Merge branch 'mg/doc-status-color-slot' into maintJunio C Hamano2015-03-232-2/+4
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jc/decorate-leaky-separator-color' into maintJunio C Hamano2015-03-233-57/+84
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'kn/git-cd-to-empty' into maintJunio C Hamano2015-03-232-4/+16
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'km/imap-send-libcurl-options' into maintJunio C Hamano2015-03-232-3/+17
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'mg/verify-commit' into maintJunio C Hamano2015-03-231-2/+2
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'es/rebase-i-count-todo' into maintJunio C Hamano2015-03-232-1/+11
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'tb/connect-ipv6-parse-fix' into maintJunio C Hamano2015-03-233-80/+144
| |\ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | Post 2.3 cycle (batch #12)Junio C Hamano2015-03-231-15/+46
* | | | | | | | | | | | | Merge branch 'js/completion-ctags-pattern-substitution-fix'Junio C Hamano2015-03-231-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | contrib/completion: escape the forward slash in __git_match_ctagjs/completion-ctags-pattern-substitution-fixJohn Szakmeister2015-03-141-1/+1
* | | | | | | | | | | | | | Merge branch 'jk/push-config'Junio C Hamano2015-03-234-9/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | push: allow --follow-tags to be set by config push.followTagsjk/push-configDave Olszewski2015-03-144-1/+21
| * | | | | | | | | | | | | | cmd_push: pass "flags" pointer to config callbackJeff King2015-02-171-1/+1
| * | | | | | | | | | | | | | cmd_push: set "atomic" bit directlyJeff King2015-02-171-5/+1
| * | | | | | | | | | | | | | git_push_config: drop cargo-culted wt_status pointerJeff King2015-02-151-2/+1
* | | | | | | | | | | | | | | Merge branch 'nd/config-doc-camelCase'Junio C Hamano2015-03-2337-212/+212
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | *config.txt: stick to camelCase naming conventionnd/config-doc-camelCaseNguyễn Thái Ngọc Duy2015-03-1337-212/+212
* | | | | | | | | | | | | | | | Merge branch 'jk/test-annoyances'Junio C Hamano2015-03-235-15/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | t5551: make EXPENSIVE test cheaperjk/test-annoyancesJeff King2015-03-121-5/+14
| * | | | | | | | | | | | | | | | t5541: move run_with_cmdline_limit to test-lib.shJeff King2015-03-122-6/+6
| * | | | | | | | | | | | | | | | t: pass GIT_TRACE through ApacheJeff King2015-03-122-0/+2
| * | | | | | | | | | | | | | | | t: redirect stderr GIT_TRACE to descriptor 4Jeff King2015-03-121-4/+1
| * | | | | | | | | | | | | | | | t: translate SIGINT to an exitJeff King2015-03-121-0/+1
* | | | | | | | | | | | | | | | | Merge branch 'jk/smart-http-hide-refs'Junio C Hamano2015-03-232-6/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | upload-pack: do not check NULL return of lookup_unknown_objectjk/smart-http-hide-refsJeff King2015-03-121-2/+0
| * | | | | | | | | | | | | | | | | upload-pack: fix transfer.hiderefs over smart-httpJeff King2015-03-122-4/+21
* | | | | | | | | | | | | | | | | | Merge branch 'jk/tag-h-column-is-a-listing-option'Junio C Hamano2015-03-231-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | tag: fix some mis-organized options in "-h" listingjk/tag-h-column-is-a-listing-optionJeff King2015-03-121-2/+2
* | | | | | | | | | | | | | | | | | | Post 2.3 cycle (batch #11)Junio C Hamano2015-03-201-0/+64
* | | | | | | | | | | | | | | | | | | Merge branch 'mg/log-decorate-HEAD'Junio C Hamano2015-03-203-13/+72
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | log: decorate HEAD with branch nameJunio C Hamano2015-03-103-13/+72
| * | | | | | | | | | | | | | | | | | | Merge branch 'jc/decorate-leaky-separator-color' into HEADJunio C Hamano2015-03-103-57/+84
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | / / / / / / | | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'jc/decorate-leaky-separator-color'Junio C Hamano2015-03-203-57/+82
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | log --decorate: do not leak "commit" color into the next itemjc/decorate-leaky-separator-colorJunio C Hamano2015-03-043-8/+16
| * | | | | | | | | | | | | | | | | | Documentation/config.txt: simplify boolean description in the syntax sectionJunio C Hamano2015-03-041-2/+2
| * | | | | | | | | | | | | | | | | | Documentation/config.txt: describe 'color' value type in the "Values" sectionJunio C Hamano2015-03-041-16/+13
| * | | | | | | | | | | | | | | | | | Documentation/config.txt: have a separate "Values" sectionJunio C Hamano2015-03-041-8/+31
| * | | | | | | | | | | | | | | | | | Documentation/config.txt: describe the structure first and then meaningJunio C Hamano2015-03-041-16/+15
| * | | | | | | | | | | | | | | | | | Documentation/config.txt: explain multi-valued variables onceJunio C Hamano2015-03-041-4/+3
| * | | | | | | | | | | | | | | | | | Documentation/config.txt: avoid unnecessary negationJunio C Hamano2015-03-041-3/+3
* | | | | | | | | | | | | | | | | | | Merge branch 'sb/leaks'Junio C Hamano2015-03-203-7/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | builtin/help.c: fix memory leakStefan Beller2015-03-101-1/+2