summaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ph/submodule-rebase'Junio C Hamano2009-06-202-4/+17
|\
| * git-submodule: add support for --merge.Johan Herland2009-06-032-4/+17
* | Merge branch 'mg/pushurl'Junio C Hamano2009-06-203-0/+10
|\ \
| * | technical/api-remote: Describe new struct remote member pushurlMichael J Gruber2009-06-091-0/+4
| * | Allow push and fetch urls to be differentMichael J Gruber2009-06-092-0/+6
* | | Merge branch 'sb/pull-rebase'Junio C Hamano2009-06-201-20/+0
|\ \ \
| * | | parse-remote: remove unused functionsSanti Béjar2009-06-111-20/+0
* | | | Merge branch 'pb/send-email-cccmd-fix'Junio C Hamano2009-06-201-2/+2
|\ \ \ \
| * | | | Test cccmd in t9001-send-email.sh and fix some bugsPaolo Bonzini2009-06-181-2/+2
* | | | | Add -k option to cvsexportcommit to revert expanded CVS keywords in CVS worki...Alex Bennée2009-06-181-0/+4
|/ / / /
* | | | Merge branch 'maint'Junio C Hamano2009-06-131-33/+32
|\ \ \ \
| * \ \ \ Merge branch 'maint-1.6.2' into maintJunio C Hamano2009-06-131-33/+32
| |\ \ \ \
| | * \ \ \ Merge branch 'maint-1.6.1' into maint-1.6.2Junio C Hamano2009-06-131-33/+32
| | |\ \ \ \
| | | * \ \ \ Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-06-131-33/+32
| | | |\ \ \ \
| | | | * | | | git-rerere.txt: grammatical fixups and cleanupsStephen Boyd2009-06-131-33/+32
* | | | | | | | Merge branch 'mh/fix-send-email-threaded'Junio C Hamano2009-06-131-2/+3
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'mh/maint-fix-send-email-threaded' into mh/fix-send-email-threadedJunio C Hamano2009-06-121-2/+3
| |\ \ \ \ \ \ \ \
| | * | | | | | | | doc/send-email: clarify the behavior of --in-reply-to with --no-threadMarkus Heidelberg2009-06-121-2/+3
| | |/ / / / / / /
* | | | | | | | | Merge branch 'ph/submodule-rebase' (early part)Junio C Hamano2009-06-132-2/+21
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Rename submodule.<name>.rebase to submodule.<name>.updateJohan Herland2009-06-032-4/+10
| * | | | | | | | git-submodule: add support for --rebase.Peter Hutterer2009-04-242-2/+15
* | | | | | | | | Merge branch 'da/araxis-mergetool'Junio C Hamano2009-06-133-3/+3
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | mergetool--lib: add support for araxis mergeDavid Aguilar2009-05-243-3/+3
* | | | | | | | | Merge branch 'maint'Junio C Hamano2009-06-111-0/+4
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | / / | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Documentation: git-send-mail can take rev-list arg to drive format-patchPaolo Bonzini2009-06-111-0/+4
* | | | | | | | git-repack.txt: Clarify implications of -a for dumb protocolsMichael J Gruber2009-06-091-2/+5
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Documentation: mention 'git stash pop --index' option explicitlySZEDER Gábor2009-06-091-8/+8
* | | | | | | Merge branch 'maint'Junio C Hamano2009-06-062-1/+8
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Documentation: refer to gitworkflows(7) from tutorial and git(1)Thomas Rast2009-06-062-1/+8
* | | | | | | Documentation/git.txt: update links to release notesJunio C Hamano2009-06-031-1/+6
* | | | | | | Merge branch 'maint' to sync with 1.6.3.2Junio C Hamano2009-06-031-7/+5
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | GIT 1.6.3.2v1.6.3.2Junio C Hamano2009-06-031-7/+5
* | | | | | | Merge branch 'maint'Junio C Hamano2009-06-031-14/+26
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Update draft release notes for 1.6.3.2Junio C Hamano2009-06-021-14/+26
| * | | | | | Documentation: teach stash/pop workflow instead of stash/applyThomas Rast2009-05-282-16/+18
* | | | | | | git-show-branch.txt: document --date-order optionStephen Boyd2009-06-011-3/+9
* | | | | | | Merge branch 'sb/opt-filename'Junio C Hamano2009-05-311-2/+7
|\ \ \ \ \ \ \
| * | | | | | | parse-opts: add OPT_FILENAME and transition builtinsStephen Boyd2009-05-251-0/+5
| * | | | | | | parse-opts: prepare for OPT_FILENAMEStephen Boyd2009-05-251-2/+2
| * | | | | | | Merge branch 'jc/mktree' into sb/opt-filenameJunio C Hamano2009-05-251-3/+16
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge branch 'jc/mktree'Junio C Hamano2009-05-311-3/+16
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | mktree --batch: build more than one tree objectJosh Micich2009-05-161-1/+7
| * | | | | | | | mktree --missing: updated usage message and man pageJosh Micich2009-05-161-3/+10
* | | | | | | | | Merge branch 'mw/send-email'Junio C Hamano2009-05-311-12/+15
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Docs: send-email: --smtp-server-port can take symbolic portsMichael Witten2009-04-141-1/+3
| * | | | | | | | | Docs: send-email: Refer to CONFIGURATION section for sendemail.multieditMichael Witten2009-04-141-3/+4
| * | | | | | | | | Docs: send-email: Put options back into alphabetical orderMichael Witten2009-04-141-11/+11
* | | | | | | | | | config.txt: document add.ignore-errorsStephen Boyd2009-05-311-0/+5
* | | | | | | | | | git-apply(1): Clarify that one can select where to apply the patchBjörn Steinbrink2009-05-311-1/+1
* | | | | | | | | | Documentation: teach stash/pop workflow instead of stash/applyThomas Rast2009-05-302-16/+18