summaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Expand)AuthorAgeFilesLines
* Documentation/git.txt: update list of maintenance releasesJunio C Hamano2010-12-091-4/+8
* Merge branch 'il/remote-fd-ext'Junio C Hamano2010-12-082-0/+184
|\
| * remote-fd/ext: finishing touches after code reviewIlari Liusvaara2010-11-192-10/+10
| * git-remote-extIlari Liusvaara2010-10-131-0/+125
| * git-remote-fdIlari Liusvaara2010-10-131-0/+59
* | Merge branch 'jk/pager-per-command'Junio C Hamano2010-12-081-5/+7
|\ \
| * | allow command-specific pagers in pager.<cmd>Jeff King2010-11-171-5/+7
* | | Merge branch 'jh/notes-merge'Junio C Hamano2010-12-082-4/+108
|\ \ \
| * | | Provide 'git merge --abort' as a synonym to 'git reset --merge'Johan Herland2010-11-171-3/+24
| * | | Provide 'git notes get-ref' to easily retrieve current notes refJohan Herland2010-11-171-0/+5
| * | | git notes merge: Add another auto-resolving strategy: "cat_sort_uniq"Johan Herland2010-11-171-1/+11
| * | | git notes merge: Manual conflict resolution, part 2/2Johan Herland2010-11-171-0/+22
| * | | git notes merge: Manual conflict resolution, part 1/2Johan Herland2010-11-171-3/+7
| * | | Documentation: Preliminary docs on 'git notes merge'Johan Herland2010-11-171-1/+43
* | | | Merge branch 'maint'Junio C Hamano2010-12-071-6/+6
|\ \ \ \
| * | | | git-rm.txt: Fix quotingMichael J Gruber2010-12-071-6/+6
* | | | | Merge branch 'jn/ignore-doc'Junio C Hamano2010-12-031-7/+23
|\ \ \ \ \
| * | | | | Documentation: point to related commands from gitignoreJonathan Nieder2010-11-111-5/+19
| * | | | | Documentation: split gitignore page into sectionsJonathan Nieder2010-11-111-2/+4
| | |_|/ / | |/| | |
* | | | | Merge branch 'pn/commit-autosquash'Junio C Hamano2010-12-031-4/+17
|\ \ \ \ \
| * | | | | commit: --squash option for use with rebase --autosquashPat Notz2010-11-041-1/+8
| * | | | | commit: --fixup option for use with rebase --autosquashPat Notz2010-11-041-4/+10
* | | | | | Merge branch 'sn/diff-doc'Junio C Hamano2010-12-033-5/+63
|\ \ \ \ \ \
| * | | | | | docs: clarify git diff modes of operationJeff King2010-11-052-4/+10
| * | | | | | diff,difftool: Don't use the {0,2} notation in usage stringsŠtěpán Němec2010-11-052-2/+2
| * | | | | | CodingGuidelines: Add a section on writing documentationŠtěpán Němec2010-11-051-0/+52
* | | | | | | Merge branch 'jc/abbrev-guard'Junio C Hamano2010-12-031-0/+9
|\ \ \ \ \ \ \
| * | | | | | | core.abbrevguard: Ensure short object names stay unique a bit longerJunio C Hamano2010-10-281-0/+9
| |/ / / / / /
* | | | | | | Merge branch 'maint' to sync with Git 1.7.3.3Junio C Hamano2010-12-033-4/+16
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Git 1.7.3.3v1.7.3.3Junio C Hamano2010-12-031-2/+10
| * | | | | | CodingGuidelines: mention whitespace preferences for shell scriptsGiuseppe Bilotta2010-12-031-0/+4
| * | | | | | Documentation: do not misinterpret pull refspec as bold textJonathan Nieder2010-12-031-2/+2
* | | | | | | Update draft release notes to 1.7.4Junio C Hamano2010-12-021-10/+37
* | | | | | | Merge branch 'maint'Junio C Hamano2010-12-026-2/+78
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Prepare for 1.7.3.3Junio C Hamano2010-12-024-0/+76
| |\ \ \ \ \ \
| | * \ \ \ \ \ Git 1.7.2.4v1.7.2.4Junio C Hamano2010-12-023-0/+30
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Git 1.7.1.3v1.7.1.3Junio C Hamano2010-12-022-0/+20
| | | |\ \ \ \ \ \
| | | | * | | | | | Git 1.7.0.8v1.7.0.8Junio C Hamano2010-12-021-0/+10
| * | | | | | | | | Documentation: Fix mark-up of lines with more than one tildeJunio C Hamano2010-12-022-2/+2
| * | | | | | | | | Merge branch 'jk/add-e-doc' into maintJunio C Hamano2010-12-021-3/+77
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'bc/fortran-userdiff' into maintJunio C Hamano2010-12-021-0/+2
| |\ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ Merge branch 'maint'Junio C Hamano2010-12-012-3/+7
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge branch 'maint-1.7.2' into maintJunio C Hamano2010-12-012-3/+7
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Merge branch 'maint-1.7.1' into maint-1.7.2Junio C Hamano2010-12-011-1/+5
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / | | | |/| | | | | | | |
| | | * | | | | | | | | Merge branch 'maint-1.7.0' into maint-1.7.1Junio C Hamano2010-12-011-1/+5
| | | |\ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / | | | | |/| | | | | | |
| | | | * | | | | | | | add: introduce add.ignoreerrors synonym for add.ignore-errorsJonathan Nieder2010-12-011-1/+5
| | * | | | | | | | | | git-commit.txt: (synopsis): move -i and -o before "--"Jari Aalto2010-12-011-2/+2
| * | | | | | | | | | | Merge branch 'jl/maint-pull-tags-doc' into maintJunio C Hamano2010-11-241-0/+2
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/repack-reuse-object' into maintJunio C Hamano2010-11-242-1/+9
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mg/reset-doc' into maintJunio C Hamano2010-11-241-29/+47
| |\ \ \ \ \ \ \ \ \ \ \ \ \