Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | Merge branch 'jk/diff-highlight' | Junio C Hamano | 2012-02-21 | 2 | -37/+181 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | diff-highlight: document some non-optimal casesjk/diff-highlight | Jeff King | 2012-02-13 | 1 | -0/+93 | |
| * | | | | | | | | | diff-highlight: match multi-line hunks | Jeff King | 2012-02-13 | 2 | -34/+52 | |
| * | | | | | | | | | diff-highlight: refactor to prepare for multi-line hunks | Jeff King | 2012-02-13 | 1 | -8/+14 | |
| * | | | | | | | | | diff-highlight: don't highlight whole lines | Jeff King | 2012-02-13 | 1 | -2/+26 | |
| * | | | | | | | | | diff-highlight: make perl strict and warnings fatal | Jeff King | 2012-02-13 | 1 | -0/+3 | |
* | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2012-02-21 | 2 | -17/+56 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | / / / / / / | | |_|/ / / / / / | |/| | | | | | | | ||||||
| * | | | | | | | | Update draft release notes to 1.7.9.2 | Junio C Hamano | 2012-02-21 | 1 | -16/+55 | |
| * | | | | | | | | Merge branch 'cb/receive-pack-keep-errors' into maint | Junio C Hamano | 2012-02-21 | 2 | -11/+35 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ | Merge branch 'cb/transfer-no-progress' into maint | Junio C Hamano | 2012-02-21 | 7 | -21/+28 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'jk/git-dir-lookup' into maint | Junio C Hamano | 2012-02-21 | 5 | -5/+109 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/diff-stat-scaler' into maint | Junio C Hamano | 2012-02-21 | 1 | -7/+20 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'zj/term-columns' into maint | Junio C Hamano | 2012-02-21 | 3 | -22/+38 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'cb/maint-rev-list-verify-object' into maint | Junio C Hamano | 2012-02-21 | 2 | -2/+28 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'cb/maint-t5541-make-server-port-portable' into maint | Junio C Hamano | 2012-02-21 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dp/i18n-libcharset' into maint | Junio C Hamano | 2012-02-21 | 3 | -0/+16 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/grep-binary-attribute' into maint | Junio C Hamano | 2012-02-21 | 5 | -192/+308 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/diffstat-gramnum' into maint | Junio C Hamano | 2012-02-21 | 69 | -118/+168 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/find-pack-entry-recent-cache-invalidation' into maint | Junio C Hamano | 2012-02-21 | 1 | -38/+46 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'tt/profile-build-fix' into maint | Junio C Hamano | 2012-02-21 | 2 | -22/+50 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'fc/zsh-completion' into maint | Junio C Hamano | 2012-02-21 | 1 | -56/+11 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | completion: Allow dash as the first character for __git_ps1 | Christian Hammerl | 2012-02-21 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | | | | | Update draft release notes to 1.7.10 | Junio C Hamano | 2012-02-20 | 1 | -24/+40 | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'tg/tag-points-at' | Junio C Hamano | 2012-02-20 | 3 | -2/+93 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | builtin/tag.c: Fix a sparse warningtg/tag-points-at | Ramsay Jones | 2012-02-13 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | | | | | tag: add --points-at list option | Tom Grennan | 2012-02-08 | 3 | -2/+93 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/diff-stat-scaler' | Junio C Hamano | 2012-02-20 | 1 | -7/+20 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | diff --stat: show bars of same length for paths with same amount of changesjc/diff-stat-scaler | Junio C Hamano | 2012-02-14 | 1 | -7/+20 | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'zj/decimal-width' | Junio C Hamano | 2012-02-20 | 3 | -15/+16 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | make lineno_width() from blame reusable for otherszj/decimal-width | Zbigniew Jędrzejewski-Szmek | 2012-02-14 | 3 | -15/+16 | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'zj/term-columns' | Junio C Hamano | 2012-02-20 | 3 | -22/+38 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | pager: find out the terminal width before spawning the pagerzj/term-columns | Zbigniew Jędrzejewski-Szmek | 2012-02-13 | 3 | -22/+38 | |
| | |/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'cb/transfer-no-progress' | Junio C Hamano | 2012-02-20 | 7 | -21/+28 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | push/fetch/clone --no-progress suppresses progress outputcb/transfer-no-progress | Clemens Buchacher | 2012-02-13 | 7 | -21/+28 | |
| | |/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'cb/receive-pack-keep-errors' | Junio C Hamano | 2012-02-20 | 2 | -11/+35 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | do not override receive-pack errorscb/receive-pack-keep-errors | Clemens Buchacher | 2012-02-13 | 2 | -11/+35 | |
| | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | Merge branch 'cb/maint-t5541-make-server-port-portable' | Junio C Hamano | 2012-02-20 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | t5541: check error message against the real port number usedcb/maint-t5541-make-server-port-portable | Clemens Buchacher | 2012-02-13 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'cb/maint-rev-list-verify-object' | Junio C Hamano | 2012-02-20 | 2 | -2/+28 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | git rev-list: fix invalid typecastcb/maint-rev-list-verify-object | Clemens Buchacher | 2012-02-13 | 2 | -2/+28 | |
| | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2012-02-20 | 3 | -1/+44 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | Update draft release notes to 1.7.9.2 | Junio C Hamano | 2012-02-20 | 1 | -0/+3 | |
| * | | | | | | | | | | | | | | | | | | gitweb: Fix 'grep' search for multiple matches in file | Jakub Narebski | 2012-02-19 | 2 | -1/+41 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | Sync with maint | Junio C Hamano | 2012-02-16 | 3 | -4/+31 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | / / / | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | Update draft release notes to 1.7.9.2 | Junio C Hamano | 2012-02-16 | 2 | -1/+28 | |
| * | | | | | | | | | | | | | | | | Merge branch 'jc/checkout-out-of-unborn' into maint | Junio C Hamano | 2012-02-16 | 2 | -1/+29 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/maint-mailmap-output' into maint | Junio C Hamano | 2012-02-16 | 1 | -8/+10 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/prompt-fallback-to-tty' into maint | Junio C Hamano | 2012-02-16 | 1 | -9/+18 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jn/gitweb-search-utf-8' into maint | Junio C Hamano | 2012-02-16 | 1 | -8/+8 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/maint-commit-ignore-i-t-a' into maint | Junio C Hamano | 2012-02-16 | 2 | -6/+8 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |