summaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'mp/diff-algo-config'Junio C Hamano2013-02-172-0/+37
|\
| * diff: Introduce --diff-algorithm command line optionMichal Privoznik2013-01-161-0/+20
| * config: Introduce diff.algorithm variableMichal Privoznik2013-01-161-0/+17
* | Update draft release notes to 1.8.2Junio C Hamano2013-02-151-0/+12
* | Merge branch 'wk/man-deny-current-branch-is-default-these-days'Junio C Hamano2013-02-141-3/+4
|\ \
| * | user-manual: Update for receive.denyCurrentBranch=refuseW. Trevor King2013-02-141-3/+4
* | | Documentation/git-add: kill remaining <filepattern>Junio C Hamano2013-02-141-1/+1
* | | Update draft release notes to 1.8.2Junio C Hamano2013-02-141-0/+9
* | | Merge branch 'mg/bisect-doc'Junio C Hamano2013-02-141-1/+6
|\ \ \
| * | | git-bisect.txt: clarify that reset quits bisectMichael J Gruber2013-02-111-1/+6
| |/ /
* | | Merge branch 'tz/perl-styles'Junio C Hamano2013-02-141-0/+42
|\ \ \
| * | | Update CodingGuidelines for PerlTed Zlatanov2013-02-061-0/+42
* | | | Merge branch 'maint'Junio C Hamano2013-02-121-5/+5
|\ \ \ \
| * | | | Replace filepattern with pathspec for consistencyMatthieu Moy2013-02-121-5/+5
* | | | | Update draft release notes to 1.8.2Junio C Hamano2013-02-101-0/+25
* | | | | Merge branch 'maint'Junio C Hamano2013-02-101-16/+10
|\ \ \ \ \ | |/ / / /
| * | | | user-manual: Rewrite git-gc section for automatic packingW. Trevor King2013-02-101-12/+6
| * | | | user-manual: Fix 'you - Git' -> 'you--Git' typoW. Trevor King2013-02-101-1/+1
| * | | | user-manual: Fix 'http' -> 'HTTP' typosW. Trevor King2013-02-101-3/+3
| * | | | user-manual: Fix 'both: so' -> 'both; so' typoW. Trevor King2013-02-101-1/+1
* | | | | Update draft release notes to 1.8.2Junio C Hamano2013-02-071-5/+15
* | | | | Sync with 1.8.1.3Junio C Hamano2013-02-072-1/+22
|\ \ \ \ \ | |/ / / /
| * | | | Git 1.8.1.3v1.8.1.3Junio C Hamano2013-02-072-1/+22
* | | | | Merge branch 'da/mergetool-docs'Junio C Hamano2013-02-074-14/+34
|\ \ \ \ \
| * | | | | doc: generate a list of valid merge toolsDavid Aguilar2013-02-024-14/+34
* | | | | | Merge branch 'jk/doc-makefile-cleanup'Junio C Hamano2013-02-071-9/+30
|\ \ \ \ \ \
| * | | | | | Documentation/Makefile: clean up MAN*_TXT listsJeff King2013-02-011-9/+29
* | | | | | | Merge branch 'jk/remote-helpers-doc'Junio C Hamano2013-02-075-7/+23
|\ \ \ \ \ \ \
| * | | | | | | Rename {git- => git}remote-helpers.txtJohn Keeping2013-02-015-7/+23
* | | | | | | | Merge branch 'nd/branch-error-cases'Junio C Hamano2013-02-071-10/+12
|\ \ \ \ \ \ \ \
| * | | | | | | | branch: let branch filters imply --listJeff King2013-01-311-3/+3
| * | | | | | | | docs: clarify git-branch --list behaviorJeff King2013-01-311-7/+9
* | | | | | | | | Merge branch 'jk/python-styles'Junio C Hamano2013-02-071-0/+14
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | CodingGuidelines: add Python coding guidelinesJohn Keeping2013-01-301-0/+14
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Update draft release notes to 1.8.2Junio C Hamano2013-02-051-0/+24
* | | | | | | | | Merge branch 'ta/doc-no-small-caps'Junio C Hamano2013-02-05136-958/+981
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Documentation: StGit is the right spelling, not StGITThomas Ackermann2013-02-011-2/+2
| * | | | | | | | | Documentation: describe the "repository" in repository-layoutJunio C Hamano2013-02-011-6/+18
| * | | | | | | | | Documentation: add a description for 'gitfile' to glossaryThomas Ackermann2013-02-011-0/+4
| * | | | | | | | | Documentation: do not use undefined terms git-dir and git-fileThomas Ackermann2013-02-011-3/+5
| * | | | | | | | | Documentation: the name of the system is 'Git', not 'git'Thomas Ackermann2013-02-01128-902/+902
| * | | | | | | | | Documentation: avoid poor-man's small caps GITThomas Ackermann2013-02-0127-47/+52
| |/ / / / / / / /
* | | | | | | | | Update draft release notes to 1.8.2Junio C Hamano2013-02-041-9/+25
* | | | | | | | | Merge branch 'maint'Junio C Hamano2013-02-041-0/+28
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | Start preparing for 1.8.1.3Junio C Hamano2013-02-041-0/+28
| * | | | | | | | Merge branch 'jk/cvsimport-does-not-work-with-cvsps3' into maintJunio C Hamano2013-02-041-0/+6
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jc/doc-maintainer' into maintJunio C Hamano2013-02-041-91/+256
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'mm/add-u-A-sans-pathspec'Junio C Hamano2013-02-041-3/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | add: warn when -u or -A is used without pathspecMatthieu Moy2013-01-281-3/+4
* | | | | | | | | | | Merge branch 'jc/push-reject-reasons'Junio C Hamano2013-02-041-1/+11
|\ \ \ \ \ \ \ \ \ \ \