Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'maint' | Junio C Hamano | 2011-03-10 | 1 | -9/+0 |
|\ | |||||
| * | Revert "core.abbrevguard: Ensure short object names stay unique a bit longer" | Junio C Hamano | 2011-03-10 | 1 | -9/+0 |
* | | push.default: Rename 'tracking' to 'upstream' | Johan Herland | 2011-02-16 | 1 | -1/+2 |
|/ | |||||
* | Documentation updates for 'GIT_WORK_TREE without GIT_DIR' historical usecase | Junio C Hamano | 2011-01-24 | 1 | -8/+17 |
* | Fix typos in the documentation | Ralf Wildenhues | 2011-01-04 | 1 | -2/+2 |
* | Merge branch 'nd/setup' | Junio C Hamano | 2010-12-28 | 1 | -15/+8 |
|\ | |||||
| * | Revert "Documentation: always respect core.worktree if set" | Nguyễn Thái Ngọc Duy | 2010-12-22 | 1 | -15/+8 |
* | | Merge branch 'maint' | Junio C Hamano | 2010-12-19 | 1 | -1/+1 |
|\ \ | |||||
| * | | Fix typo in git-gc document. | Jiang Xin | 2010-12-17 | 1 | -1/+1 |
* | | | Merge branch 'jl/fetch-submodule-recursive' | Junio C Hamano | 2010-12-16 | 1 | -0/+12 |
|\ \ \ | |||||
| * | | | Submodules: Add the "fetchRecurseSubmodules" config option | Jens Lehmann | 2010-11-12 | 1 | -0/+7 |
| * | | | Add the 'fetch.recurseSubmodules' config setting | Jens Lehmann | 2010-11-12 | 1 | -0/+5 |
* | | | | Merge branch 'aa/status-hilite-branch' | Junio C Hamano | 2010-12-16 | 1 | -1/+2 |
|\ \ \ \ | |||||
| * | | | | status: show branchname with a configurable color | Aleksi Aalto | 2010-11-29 | 1 | -1/+2 |
* | | | | | Merge branch 'js/configurable-tab' | Junio C Hamano | 2010-12-12 | 1 | -0/+3 |
|\ \ \ \ \ | |||||
| * | | | | | Make the tab width used for whitespace checks configurable | Johannes Sixt | 2010-12-01 | 1 | -0/+3 |
| |/ / / / | |||||
* | | | | | Merge branch 'jk/pager-per-command' | Junio C Hamano | 2010-12-08 | 1 | -5/+7 |
|\ \ \ \ \ | |||||
| * | | | | | allow command-specific pagers in pager.<cmd> | Jeff King | 2010-11-17 | 1 | -5/+7 |
* | | | | | | Merge branch 'jc/abbrev-guard' | Junio C Hamano | 2010-12-03 | 1 | -0/+9 |
|\ \ \ \ \ \ | |||||
| * | | | | | | core.abbrevguard: Ensure short object names stay unique a bit longer | Junio C Hamano | 2010-10-28 | 1 | -0/+9 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge branch 'maint' | Junio C Hamano | 2010-12-01 | 1 | -1/+5 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | / | | |_|_|/ | |/| | | | |||||
| * | | | | Merge branch 'maint-1.7.2' into maint | Junio C Hamano | 2010-12-01 | 1 | -1/+5 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge branch 'maint-1.7.1' into maint-1.7.2 | Junio C Hamano | 2010-12-01 | 1 | -1/+5 |
| | |\ \ \ \ | |||||
| | | * \ \ \ | Merge branch 'maint-1.7.0' into maint-1.7.1 | Junio C Hamano | 2010-12-01 | 1 | -1/+5 |
| | | |\ \ \ \ | |||||
| | | | * | | | | add: introduce add.ignoreerrors synonym for add.ignore-errors | Jonathan Nieder | 2010-12-01 | 1 | -1/+5 |
| * | | | | | | | Merge branch 'jk/repack-reuse-object' into maint | Junio C Hamano | 2010-11-24 | 1 | -0/+4 |
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | |||||
* | | | | | | | | Change incorrect uses of "remote branch" meaning "remote-tracking" | Matthieu Moy | 2010-11-03 | 1 | -3/+4 |
* | | | | | | | | Change "tracking branch" to "remote-tracking branch" | Matthieu Moy | 2010-11-03 | 1 | -2/+2 |
* | | | | | | | | Replace "remote tracking" with "remote-tracking" | Matthieu Moy | 2010-11-03 | 1 | -1/+1 |
| |_|_|_|_|/ / |/| | | | | | | |||||
* | | | | | | | Merge branch 'po/sendemail' | Junio C Hamano | 2010-10-26 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | New send-email option smtpserveroption. | Pascal Obry | 2010-09-06 | 1 | -0/+1 |
* | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2010-10-19 | 1 | -7/+7 |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| * | | | | | | | documentation: git-config minor cleanups | Cliff Frey | 2010-10-19 | 1 | -7/+7 |
* | | | | | | | | Merge branch 'jk/repack-reuse-object' | Junio C Hamano | 2010-10-06 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||||
| * | | | | | | | Documentation: pack.compression: explain how to recompress | Jan Krüger | 2010-09-27 | 1 | -0/+4 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'po/etc-gitattributes' | Junio C Hamano | 2010-09-29 | 1 | -0/+6 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Add global and system-wide gitattributes | Petr Onderka | 2010-09-01 | 1 | -0/+6 |
* | | | | | | | Merge branch 'maint' | Junio C Hamano | 2010-09-10 | 1 | -2/+3 |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| * | | | | | | config.txt: fix placement of diff.noprefix | Mark Lodato | 2010-09-10 | 1 | -2/+3 |
| * | | | | | | Merge branch 'dj/fetch-tagopt' into maint | Junio C Hamano | 2010-09-01 | 1 | -1/+3 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'vs/doc-spell' into maint | Junio C Hamano | 2010-08-20 | 1 | -5/+7 |
| |\ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ | Merge branch 'kf/askpass-config' | Junio C Hamano | 2010-09-08 | 1 | -0/+9 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | |||||
| * | | | | | | | | Extend documentation of core.askpass and GIT_ASKPASS. | Knut Franke | 2010-08-31 | 1 | -2/+5 |
| * | | | | | | | | Add a new option 'core.askpass'. | Anselm Kruis | 2010-08-31 | 1 | -0/+6 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'jl/submodule-ignore-diff' | Junio C Hamano | 2010-09-04 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | checkout: Add test for diff.ignoreSubmodules | Jens Lehmann | 2010-08-30 | 1 | -1/+2 |
* | | | | | | | | | Merge branch 'jn/doc-backslash' | Junio C Hamano | 2010-09-03 | 1 | -4/+5 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Documentation: tweak description of log.date | Jonathan Nieder | 2010-08-20 | 1 | -4/+5 |
* | | | | | | | | | | Merge branch 'dj/fetch-tagopt' | Junio C Hamano | 2010-08-31 | 1 | -1/+3 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | fetch: allow command line --tags to override config | Daniel Johnson | 2010-08-14 | 1 | -1/+3 |
| | |_|/ / / / / / | |/| | | | | | | |