Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'mm/add-u-A-sans-pathspec' | Junio C Hamano | 2013-02-04 | 2 | -4/+47 |
|\ | |||||
| * | add: warn when -u or -A is used without pathspec | Matthieu Moy | 2013-01-28 | 2 | -4/+47 |
* | | Merge branch 'jc/push-reject-reasons' | Junio C Hamano | 2013-02-04 | 11 | -30/+107 |
|\ \ | |||||
| * | | push: finishing touches to explain REJECT_ALREADY_EXISTS better | Junio C Hamano | 2013-01-24 | 1 | -2/+1 |
| * | | push: introduce REJECT_FETCH_FIRST and REJECT_NEEDS_FORCE | Junio C Hamano | 2013-01-24 | 11 | -4/+93 |
| * | | push: further simplify the logic to assign rejection reason | Junio C Hamano | 2013-01-24 | 1 | -16/+11 |
| * | | push: further clean up fields of "struct ref" | Junio C Hamano | 2013-01-24 | 3 | -14/+8 |
* | | | Merge branch 'jk/config-parsing-cleanup' | Junio C Hamano | 2013-02-04 | 10 | -99/+117 |
|\ \ \ | |||||
| * | | | reflog: use parse_config_key in config callback | Jeff King | 2013-01-23 | 1 | -6/+7 |
| * | | | help: use parse_config_key for man config | Jeff King | 2013-01-23 | 1 | -7/+7 |
| * | | | submodule: simplify memory handling in config parsing | Jeff King | 2013-01-23 | 1 | -16/+14 |
| * | | | submodule: use parse_config_key when parsing config | Jeff King | 2013-01-23 | 1 | -9/+10 |
| * | | | userdiff: drop parse_driver function | Jeff King | 2013-01-23 | 1 | -29/+21 |
| * | | | convert some config callbacks to parse_config_key | Jeff King | 2013-01-23 | 3 | -28/+13 |
| * | | | archive-tar: use parse_config_key when parsing config | Jeff King | 2013-01-23 | 2 | -10/+3 |
| * | | | config: add helper function for parsing key names | Jeff King | 2013-01-23 | 2 | -0/+48 |
* | | | | Merge branch 'jc/custom-comment-char' | Junio C Hamano | 2013-02-04 | 20 | -78/+284 |
|\ \ \ \ | |||||
| * | | | | Allow custom "comment char" | Junio C Hamano | 2013-01-16 | 20 | -78/+284 |
* | | | | | Update draft release notes to 1.8.2 | Junio C Hamano | 2013-02-01 | 1 | -1/+41 |
* | | | | | Merge branch 'nd/edit-branch-desc-while-detached' | Junio C Hamano | 2013-02-01 | 1 | -4/+4 |
|\ \ \ \ \ | |||||
| * | | | | | branch: no detached HEAD check when editing another branch's description | Nguyễn Thái Ngọc Duy | 2013-01-30 | 1 | -4/+4 |
* | | | | | | Merge branch 'jk/gc-auto-after-fetch' | Junio C Hamano | 2013-02-01 | 2 | -0/+8 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'jk/maint-gc-auto-after-fetch' into jk/gc-auto-after-fetch | Junio C Hamano | 2013-01-26 | 2 | -0/+8 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | fetch-pack: avoid repeatedly re-scanning pack directory | Jeff King | 2013-01-26 | 1 | -0/+3 |
| | * | | | | | | fetch: run gc --auto after fetching | Jeff King | 2013-01-26 | 1 | -0/+5 |
| | |/ / / / / | |||||
* | | | | | | | Merge branch 'bc/git-p4-for-python-2.4' | Junio C Hamano | 2013-02-01 | 3 | -11/+35 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | INSTALL: git-p4 does not support Python 3 | Junio C Hamano | 2013-01-30 | 1 | -2/+3 |
| * | | | | | | | git-p4.py: support Python 2.4 | Brandon Casey | 2013-01-26 | 3 | -9/+31 |
| * | | | | | | | git-p4.py: support Python 2.5 | Brandon Casey | 2013-01-26 | 2 | -2/+3 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'jn/do-not-drop-username-when-reading-from-etc-mailname' | Junio C Hamano | 2013-02-01 | 1 | -1/+5 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | ident: do not drop username when reading from /etc/mailname | Jonathan Nieder | 2013-01-25 | 1 | -1/+5 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'jk/cvsimport-does-not-work-with-cvsps3' | Junio C Hamano | 2013-02-01 | 1 | -0/+6 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | git-cvsimport.txt: cvsps-2 is deprecated | John Keeping | 2013-01-24 | 1 | -0/+6 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Merge branch 'jc/do-not-let-random-file-interfere-with-completion-tests' | Junio C Hamano | 2013-02-01 | 2 | -2/+34 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | t9902: protect test from stray build artifacts | Junio C Hamano | 2013-01-24 | 2 | -2/+34 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'as/test-cleanup' | Junio C Hamano | 2013-02-01 | 1 | -20/+21 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | t7102 (reset): don't hardcode SHA-1 in expected outputs | Alexey Shumkin | 2013-01-24 | 1 | -20/+21 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'jc/no-git-config-in-clone' | Junio C Hamano | 2013-02-01 | 1 | -9/+0 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | clone: do not export and unexport GIT_CONFIG | Junio C Hamano | 2013-01-11 | 1 | -9/+0 |
* | | | | | | | | Merge branch 'nd/fetch-depth-is-broken' | Junio C Hamano | 2013-02-01 | 8 | -12/+85 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | fetch: elaborate --depth action | Nguyễn Thái Ngọc Duy | 2013-01-11 | 1 | -1/+1 |
| * | | | | | | | | upload-pack: fix off-by-one depth calculation in shallow clone | Nguyễn Thái Ngọc Duy | 2013-01-11 | 2 | -7/+26 |
| * | | | | | | | | fetch: add --unshallow for turning shallow repo into complete one | Nguyễn Thái Ngọc Duy | 2013-01-11 | 7 | -4/+58 |
* | | | | | | | | | Merge git://ozlabs.org/~paulus/gitk | Junio C Hamano | 2013-01-30 | 2 | -2/+16 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | gitk: Ignore gitk-wish buildproduct | Christian Couder | 2013-01-30 | 2 | -2/+16 |
* | | | | | | | | | | Merge branch 'rr/minimal-stat' | Junio C Hamano | 2013-01-30 | 5 | -10/+28 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Enable minimal stat checking | Robin Rosenberg | 2013-01-22 | 5 | -10/+28 |
* | | | | | | | | | | | Merge branch 'nd/magic-pathspec-from-root' | Junio C Hamano | 2013-01-30 | 3 | -3/+25 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | grep: avoid accepting ambiguous revision | Nguyễn Thái Ngọc Duy | 2013-01-21 | 1 | -0/+2 |
| * | | | | | | | | | | | Update :/abc ambiguity check | Nguyễn Thái Ngọc Duy | 2013-01-21 | 2 | -3/+23 |