summaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | Merge branch 'aa/status-hilite-branch'Junio C Hamano2010-12-161-1/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | status: show branchname with a configurable colorAleksi Aalto2010-11-291-1/+2
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jn/fast-import-ondemand-checkpoint'Junio C Hamano2010-12-161-0/+7
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | fast-import: treat SIGUSR1 as a request to access objects earlyJonathan Nieder2010-11-241-0/+7
* | | | | | | | | | | | Sync with 1.7.3.4Junio C Hamano2010-12-158-1/+90
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Git 1.7.3.4v1.7.3.4Junio C Hamano2010-12-157-0/+88
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / | | |/| | | | | | | | |
| | * | | | | | | | | | Git 1.7.2.5v1.7.2.5Junio C Hamano2010-12-156-0/+85
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / | | | |/| | | | | | | |
| | | * | | | | | | | | Git 1.7.1.4v1.7.1.4Junio C Hamano2010-12-155-0/+77
| | | |\ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|/ | | | | |/| | | | | | |
| | | | * | | | | | | | Git 1.7.0.9v1.7.0.9Junio C Hamano2010-12-154-0/+69
| | | | |\ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ Git 1.6.6.3v1.6.6.3Junio C Hamano2010-12-153-0/+61
| | | | | |\ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ Git 1.6.5.9v1.6.5.9Junio C Hamano2010-12-152-0/+38
| | | | | | |\ \ \ \ \ \ \ \
| | | | | | | * | | | | | | | Git 1.6.4.5v1.6.4.5Junio C Hamano2010-12-151-0/+20
| | | | | | | * | | | | | | | Merge branch 'jn/maint-1.6.3-check-ref-format-doc' into maint-1.6.4Junio C Hamano2009-10-251-3/+6
| | | | | | | |\ \ \ \ \ \ \ \
* | | | | | | | \ \ \ \ \ \ \ \ Merge branch 'maint'Junio C Hamano2010-12-142-5/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Prepare for 1.7.3.4Junio C Hamano2010-12-141-0/+10
| * | | | | | | | | | | | | | | Merge branch 'ja/maint-pull-rebase-doc' into maintJunio C Hamano2010-12-141-2/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ja/maint-pull-rebase-doc'Junio C Hamano2010-12-121-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | git-pull.txt: Mention branch.autosetuprebaseJari Aalto2010-12-031-2/+3
* | | | | | | | | | | | | | | | | Merge branch 'gb/web--browse'Junio C Hamano2010-12-121-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | web--browse: better support for chromiumGiuseppe Bilotta2010-12-031-2/+2
| * | | | | | | | | | | | | | | | | web--browse: support opera, seamonkey and elinksGiuseppe Bilotta2010-12-031-0/+6
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge branch 'js/configurable-tab'Junio C Hamano2010-12-122-2/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Make the tab width used for whitespace checks configurableJohannes Sixt2010-12-012-2/+7
| | |_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'mz/rebase-i-verify'Junio C Hamano2010-12-121-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | rebase: support --verifyMartin von Zweigbergk2010-11-231-0/+4
| | |_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'jk/asciidoc-update'Junio C Hamano2010-12-122-15/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | docs: default to more modern toolsetJeff King2010-11-242-15/+12
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Relnotes: remove items fixed on 'maint'Junio C Hamano2010-12-101-13/+0
* | | | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2010-12-102-0/+35
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Prepare for 1.7.3.4Junio C Hamano2010-12-101-0/+32
| * | | | | | | | | | | | | | | Add --force to git-send-email documentationAlejandro R. SedeƱo2010-12-101-0/+3
| * | | | | | | | | | | | | | | Merge branch 'jn/ignore-doc' into maintJunio C Hamano2010-12-091-7/+23
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | 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