summaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ld/git-p4-tags-and-labels'Junio C Hamano2012-04-301-12/+42
|\
| * git p4: move verbose to base classLuke Diamand2012-04-241-7/+4
| * git p4: fix-up "import/export of labels to/from p4"Luke Diamand2012-04-241-10/+10
| * git p4: import/export of labels to/from p4Luke Diamand2012-04-111-5/+38
* | Merge branch 'nh/empty-rebase'Junio C Hamano2012-04-302-0/+23
|\ \
| * | git-rebase: add keep_empty flagNeil Horman2012-04-241-0/+4
| * | git-cherry-pick: Add keep-redundant-commits optionNeil Horman2012-04-241-1/+11
| * | git-cherry-pick: add allow-empty optionNeil Horman2012-04-111-0/+9
* | | The seventh batch of topics graduated to 'master'Junio C Hamano2012-04-291-0/+16
* | | Merge branch 'kk/gitweb-omit-expensive'Junio C Hamano2012-04-291-0/+7
|\ \ \
| * | | gitweb: Option to not display information about ownerKacper Kornet2012-04-261-0/+3
| * | | gitweb: Option to omit column with time of the last changeKacper Kornet2012-04-251-0/+4
| |/ /
* | | Merge branch 'mm/include-userpath'Junio C Hamano2012-04-291-1/+4
|\ \ \
| * | | config: expand tildes in include.path variableJeff King2012-04-291-1/+4
| |/ /
* | | Merge branch 'jk/repack-no-explode-objects-from-old-pack'Junio C Hamano2012-04-291-0/+5
|\ \ \
| * | | argv-array: add a new "pushl" methodJeff King2012-04-181-0/+5
| |/ /
* | | The sixth batch of topics graduated to 'master'Junio C Hamano2012-04-271-0/+24
* | | Update draft release notes to 1.7.11Junio C Hamano2012-04-261-53/+11
* | | Merge bundle error message fix inJunio C Hamano2012-04-265-3/+104
|\ \ \
| * | | Start preparing for 1.7.10.1Junio C Hamano2012-04-261-0/+50
| * | | Merge branch 'jc/commit-unedited-template' into maintJunio C Hamano2012-04-261-5/+8
| |\ \ \
| * \ \ \ Sync with 1.7.9.7Junio C Hamano2012-04-264-3/+54
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Git 1.7.9.7v1.7.9.7maint-1.7.9Junio C Hamano2012-04-262-1/+15
| | * | | Sync with 1.7.8.6Junio C Hamano2012-04-263-2/+39
| | |\ \ \
| | | * | | Git 1.7.8.6v1.7.8.6maint-1.7.8Junio C Hamano2012-04-262-1/+25
| | | * | | Sync with 1.7.7.7Junio C Hamano2012-04-262-1/+15
| | | |\ \ \
| | | | * | | Git 1.7.7.7v1.7.7.7maint-1.7.7Junio C Hamano2012-04-262-1/+16
| | * | | | | Merge branch 'maint-1.7.8' into maint-1.7.9Junio C Hamano2012-04-101-2/+2
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge branch 'dw/gitweb-doc-grammo' into maint-1.7.8Junio C Hamano2012-04-091-2/+2
| | | |\ \ \ \
| | | * \ \ \ \ Merge branch 'cn/maint-rev-list-doc' into maint-1.7.8Junio C Hamano2012-04-091-6/+6
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge branch 'tr/maint-bundle-long-subject' into maint-1.7.8Junio C Hamano2012-04-091-1/+17
| | | |\ \ \ \ \ \
* | | | | | | | | | The fifth batch of topics graduated to 'master'Junio C Hamano2012-04-241-0/+26
* | | | | | | | | | Merge branch 'it/fetch-pack-many-refs'Junio C Hamano2012-04-241-0/+10
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | fetch-pack: new --stdin option to read refs from stdinIvan Todoroski2012-04-021-0/+10
* | | | | | | | | | | Merge branch 'hv/submodule-recurse-push'Junio C Hamano2012-04-242-4/+15
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | push: teach --recurse-submodules the on-demand optionHeiko Voigt2012-03-301-4/+10
| * | | | | | | | | | | Teach revision walking machinery to walk multiple times sequenciallyHeiko Voigt2012-03-301-0/+5
* | | | | | | | | | | | RelNotes: the fourth batch of topics graduated to 'master'Junio C Hamano2012-04-231-0/+27
* | | | | | | | | | | | Merge branch 'jn/fast-import-doc'Junio C Hamano2012-04-231-3/+39
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | fast-import doc: cat-blob and ls responses need to be consumed quicklyJonathan Nieder2012-04-151-3/+39
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'jn/debian-customizes-default-editor'Junio C Hamano2012-04-232-2/+20
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | var doc: advertise current DEFAULT_PAGER and DEFAULT_EDITOR settingsJonathan Nieder2012-04-102-0/+16
| * | | | | | | | | | | | var doc: default editor and pager are configurable at build timeJonathan Nieder2012-03-311-2/+4
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'pw/git-p4'Junio C Hamano2012-04-231-13/+6
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| * | | | | | | | | | | git-p4: move to toplevelPete Wyckoff2012-04-091-13/+6
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | RelNotes: the third batchJunio C Hamano2012-04-201-1/+27
* | | | | | | | | | | Merge branch 'ct/advise-push-default'Junio C Hamano2012-04-201-2/+17
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | push: Provide situational hints for non-fast-forward errorsChristopher Tiwald2012-03-191-2/+17
* | | | | | | | | | | | Merge branch 'jb/am-include'Junio C Hamano2012-04-201-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | am: support --include optionJohannes Berg2012-03-281-1/+2