Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | mergetool--lib: Add Beyond Compare 3 as a tool | Sebastian Schuberth | 2011-02-28 | 3 | -3/+3 |
* | mergetool--lib: Sort tools alphabetically for easier lookup | Sebastian Schuberth | 2011-02-28 | 3 | -8/+8 |
* | Merge branch 'maint' | Junio C Hamano | 2011-02-21 | 2 | -14/+14 |
|\ | |||||
| * | Documentation: clarify -u<mode> option defaults | Clemens Buchacher | 2011-02-21 | 2 | -14/+14 |
* | | Merge branch 'maint' | Junio C Hamano | 2011-02-15 | 1 | -5/+6 |
|\ \ | |/ | |||||
| * | git-tag.txt: list all modes in the description | Michael J Gruber | 2011-02-15 | 1 | -5/+6 |
* | | Merge branch 'maint' | Junio C Hamano | 2011-02-11 | 2 | -1/+29 |
|\ \ | |/ | |||||
| * | Git 1.7.4.1v1.7.4.1 | Junio C Hamano | 2011-02-11 | 2 | -1/+29 |
* | | Merge branch 'rr/fi-import-marks-if-exists' | Junio C Hamano | 2011-02-09 | 1 | -0/+4 |
|\ \ | |||||
| * | | fast-import: Introduce --import-marks-if-exists | Ramkumar Ramachandra | 2011-01-18 | 1 | -0/+4 |
* | | | Merge branch 'jn/cherry-pick-strategy-option' | Junio C Hamano | 2011-02-09 | 2 | -0/+42 |
|\ \ \ | |_|/ |/| | | |||||
| * | | cherry-pick/revert: add support for -X/--strategy-option | Jonathan Nieder | 2010-12-28 | 2 | -0/+42 |
* | | | Merge branch 'maint-1.7.0' into maint | Junio C Hamano | 2011-02-09 | 1 | -0/+7 |
|\ \ \ | |||||
| * | | | fast-import: introduce "feature notes" command | Jonathan Nieder | 2011-02-09 | 1 | -0/+6 |
| * | | | fast-import: clarify documentation of "feature" command | Jonathan Nieder | 2011-02-09 | 1 | -20/+17 |
* | | | | Documentation/merge subtree How-To: fix typo | Uwe Kleine-König | 2011-02-09 | 1 | -1/+1 |
* | | | | pull: Document the "--[no-]recurse-submodules" options | Jens Lehmann | 2011-02-07 | 2 | -2/+9 |
* | | | | diff: support --cached on unborn branches | Nguyễn Thái Ngọc Duy | 2011-02-07 | 1 | -0/+2 |
* | | | | Git 1.7.4v1.7.4ko-master | Junio C Hamano | 2011-01-30 | 2 | -2/+10 |
* | | | | Git 1.7.4-rc3v1.7.4-rc3 | Junio C Hamano | 2011-01-24 | 1 | -7/+1 |
* | | | | Merge branch 'jn/setup-fixes' | Junio C Hamano | 2011-01-24 | 2 | -17/+21 |
|\ \ \ \ | |||||
| * | | | | Documentation updates for 'GIT_WORK_TREE without GIT_DIR' historical usecase | Junio C Hamano | 2011-01-24 | 2 | -17/+21 |
* | | | | | Documentation: do not treat reset --keep as a special case | Jonathan Nieder | 2011-01-21 | 1 | -7/+2 |
* | | | | | Documentation/fast-import: put explanation of M 040000 <dataref> "" in context | Jonathan Nieder | 2011-01-18 | 1 | -3/+2 |
* | | | | | Documentation/fast-import: capitalize beginning of sentence | Jonathan Nieder | 2011-01-18 | 1 | -1/+1 |
| |_|_|/ |/| | | | |||||
* | | | | Git 1.7.4-rc2v1.7.4-rc2 | Junio C Hamano | 2011-01-13 | 1 | -2/+10 |
* | | | | Merge branch 'jn/perl-funcname' | Junio C Hamano | 2011-01-13 | 1 | -0/+2 |
|\ \ \ \ | |||||
| * | | | | diff: funcname and word patterns for perl | Jonathan Nieder | 2010-12-27 | 1 | -0/+2 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'jk/diff-driver-binary-doc' | Junio C Hamano | 2011-01-13 | 1 | -0/+33 |
|\ \ \ \ | |||||
| * | | | | docs: explain diff.*.binary option | Jeff King | 2011-01-10 | 1 | -0/+33 |
* | | | | | RelNotes/1.7.4: minor fixes | Michael J Gruber | 2011-01-13 | 1 | -25/+25 |
* | | | | | Merge branch 'maint' | Junio C Hamano | 2011-01-10 | 2 | -5/+1 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | Merge branch 'maint-1.7.2' into maint | Junio C Hamano | 2011-01-10 | 2 | -5/+1 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge branch 'maint-1.7.1' into maint-1.7.2 | Junio C Hamano | 2011-01-10 | 2 | -5/+1 |
| | |\ \ \ \ | |||||
| | | * \ \ \ | Merge branch 'maint-1.7.0' into maint-1.7.1 | Junio C Hamano | 2011-01-10 | 1 | -1/+1 |
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| | | |||||
| | | | * | | | Documentation/git-archive: spell --worktree-attributes correctly | Thomas Rast | 2011-01-10 | 1 | -1/+1 |
| | | | |/ / | |||||
| | | * | | | Documentation/githooks: post-rewrite-copy-notes never existed | Thomas Rast | 2011-01-10 | 1 | -4/+0 |
* | | | | | | git svn: fix the final example in man page | StephenB | 2011-01-07 | 1 | -1/+4 |
* | | | | | | Git 1.7.4-rc1v1.7.4-rc1 | Junio C Hamano | 2011-01-05 | 2 | -2/+8 |
* | | | | | | Merge branch 'maint' to sync with 1.7.3.5 | Junio C Hamano | 2011-01-05 | 1 | -0/+2 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Git 1.7.3.5v1.7.3.5 | Junio C Hamano | 2011-01-05 | 1 | -0/+2 |
* | | | | | | Merge branch 'pw/convert-pathname-substitution' | Junio C Hamano | 2011-01-05 | 1 | -0/+10 |
|\ \ \ \ \ \ | |||||
| * | | | | | | convert filter: supply path to external driver | Pete Wyckoff | 2010-12-22 | 1 | -0/+10 |
* | | | | | | | Fix typos in the documentation | Ralf Wildenhues | 2011-01-04 | 12 | -27/+26 |
* | | | | | | | Git 1.7.4-rc0v1.7.4-rc0 | Junio C Hamano | 2010-12-28 | 1 | -10/+9 |
* | | | | | | | Merge branch 'maint' | Junio C Hamano | 2010-12-28 | 1 | -0/+32 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | Prepare for 1.7.3.5 | Junio C Hamano | 2010-12-28 | 1 | -0/+32 |
* | | | | | | | Merge branch 'nd/setup' | Junio C Hamano | 2010-12-28 | 3 | -17/+15 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | |||||
| * | | | | | | git.txt: correct where --work-tree path is relative to | Nguyễn Thái Ngọc Duy | 2010-12-22 | 1 | -1/+1 |
| * | | | | | | Revert "Documentation: always respect core.worktree if set" | Nguyễn Thái Ngọc Duy | 2010-12-22 | 1 | -15/+8 |