aboutsummaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Expand)AuthorAge
* Merge branch 'maint'Junio C Hamano2010-12-14
|\
| * Prepare for 1.7.3.4Junio C Hamano2010-12-14
| * Merge branch 'ja/maint-pull-rebase-doc' into maintJunio C Hamano2010-12-14
| |\
* | \ Merge branch 'ja/maint-pull-rebase-doc'Junio C Hamano2010-12-12
|\ \ \ | | |/ | |/|
| * | git-pull.txt: Mention branch.autosetuprebaseJari Aalto2010-12-03
* | | Merge branch 'gb/web--browse'Junio C Hamano2010-12-12
|\ \ \
| * | | web--browse: better support for chromiumGiuseppe Bilotta2010-12-03
| * | | web--browse: support opera, seamonkey and elinksGiuseppe Bilotta2010-12-03
| |/ /
* | | Merge branch 'js/configurable-tab'Junio C Hamano2010-12-12
|\ \ \
| * | | Make the tab width used for whitespace checks configurableJohannes Sixt2010-12-01
* | | | Merge branch 'mz/rebase-i-verify'Junio C Hamano2010-12-12
|\ \ \ \
| * | | | rebase: support --verifyMartin von Zweigbergk2010-11-23
* | | | | Merge branch 'jk/asciidoc-update'Junio C Hamano2010-12-12
|\ \ \ \ \
| * | | | | docs: default to more modern toolsetJeff King2010-11-24
| |/ / / /
* | | | | Relnotes: remove items fixed on 'maint'Junio C Hamano2010-12-10
* | | | | Merge branch 'maint'Junio C Hamano2010-12-10
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Prepare for 1.7.3.4Junio C Hamano2010-12-10
| * | | | Add --force to git-send-email documentationAlejandro R. Sedeño2010-12-10
| * | | | Merge branch 'jn/ignore-doc' into maintJunio C Hamano2010-12-09
| |\ \ \ \
* | | | | | Documentation/git.txt: update list of maintenance releasesJunio C Hamano2010-12-09
* | | | | | Merge branch 'il/remote-fd-ext'Junio C Hamano2010-12-08
|\ \ \ \ \ \
| * | | | | | remote-fd/ext: finishing touches after code reviewIlari Liusvaara2010-11-19
| * | | | | | git-remote-extIlari Liusvaara2010-10-13
| * | | | | | git-remote-fdIlari Liusvaara2010-10-13
* | | | | | | Merge branch 'jk/pager-per-command'Junio C Hamano2010-12-08
|\ \ \ \ \ \ \
| * | | | | | | allow command-specific pagers in pager.<cmd>Jeff King2010-11-17
* | | | | | | | Merge branch 'jh/notes-merge'Junio C Hamano2010-12-08
|\ \ \ \ \ \ \ \
| * | | | | | | | Provide 'git merge --abort' as a synonym to 'git reset --merge'Johan Herland2010-11-17
| * | | | | | | | Provide 'git notes get-ref' to easily retrieve current notes refJohan Herland2010-11-17
| * | | | | | | | git notes merge: Add another auto-resolving strategy: "cat_sort_uniq"Johan Herland2010-11-17
| * | | | | | | | git notes merge: Manual conflict resolution, part 2/2Johan Herland2010-11-17
| * | | | | | | | git notes merge: Manual conflict resolution, part 1/2Johan Herland2010-11-17
| * | | | | | | | Documentation: Preliminary docs on 'git notes merge'Johan Herland2010-11-17
* | | | | | | | | Merge branch 'maint'Junio C Hamano2010-12-07
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | git-rm.txt: Fix quotingMichael J Gruber2010-12-07
* | | | | | | | | Merge branch 'jn/ignore-doc'Junio C Hamano2010-12-03
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| * | | | | | | | Documentation: point to related commands from gitignoreJonathan Nieder2010-11-11
| * | | | | | | | Documentation: split gitignore page into sectionsJonathan Nieder2010-11-11
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'pn/commit-autosquash'Junio C Hamano2010-12-03
|\ \ \ \ \ \ \ \
| * | | | | | | | commit: --squash option for use with rebase --autosquashPat Notz2010-11-04
| * | | | | | | | commit: --fixup option for use with rebase --autosquashPat Notz2010-11-04
* | | | | | | | | Merge branch 'sn/diff-doc'Junio C Hamano2010-12-03
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | docs: clarify git diff modes of operationJeff King2010-11-05
| * | | | | | | | | diff,difftool: Don't use the {0,2} notation in usage stringsŠtěpán Němec2010-11-05
| * | | | | | | | | CodingGuidelines: Add a section on writing documentationŠtěpán Němec2010-11-05
* | | | | | | | | | Merge branch 'jc/abbrev-guard'Junio C Hamano2010-12-03
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | core.abbrevguard: Ensure short object names stay unique a bit longerJunio C Hamano2010-10-28
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'maint' to sync with Git 1.7.3.3Junio C Hamano2010-12-03
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| * | | | | | | | | Git 1.7.3.3v1.7.3.3Junio C Hamano2010-12-03
| * | | | | | | | | CodingGuidelines: mention whitespace preferences for shell scriptsGiuseppe Bilotta2010-12-03