summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Documentation: merge: add an overviewJonathan Nieder2010-01-241-2/+26
* Documentation: merge: move merge strategy list to endJonathan Nieder2010-01-241-2/+2
* Documentation: suggest `reset --merge` in How Merge Works sectionJonathan Nieder2010-01-241-3/+3
* Documentation: merge: move configuration section to endJonathan Nieder2010-01-241-9/+9
* Documentation: emphasise 'git shortlog' in its synopsisThomas Rast2010-01-101-1/+1
* Documentation: show-files is now called git-ls-filesThomas Rast2010-01-101-1/+1
* Documentation: tiny git config manual tweaksJonathan Nieder2010-01-101-4/+4
* Documentation: git gc packs refs by default nowJonathan Nieder2010-01-101-9/+6
* Documentation: spell 'git cmd' without dash throughoutThomas Rast2010-01-10112-647/+647
* Documentation: format full commands in typewriter fontThomas Rast2010-01-1012-28/+28
* Documentation: warn prominently against merging with dirty treesThomas Rast2010-01-092-0/+8
* Documentation/git-merge: reword references to "remote" and "pull"Thomas Rast2010-01-091-17/+17
* Describe second batch for 1.7.0 in draft release notesJunio C Hamano2010-01-071-1/+7
* Merge branch 'js/filter-branch-prime'Junio C Hamano2010-01-071-1/+0
|\
| * filter-branch: remove an unnecessary use of 'git read-tree'Johannes Sixt2009-12-151-1/+0
* | Merge branch 'sb/maint-octopus'Junio C Hamano2010-01-072-9/+57
|\ \
| * | octopus: remove dead codeStephen Boyd2009-12-131-5/+1
| * | octopus: reenable fast-forward mergesStephen Boyd2009-12-132-1/+19
| * | octopus: make merge process simpler to followStephen Boyd2009-12-132-4/+38
| |/
* | Merge branch 'mg/tag-d-show'Junio C Hamano2010-01-071-1/+3
|\ \
| * | tag -d: print sha1 of deleted tagMichael J Gruber2009-12-101-1/+3
* | | Merge branch 'so/cvsserver-update'Junio C Hamano2010-01-071-0/+16
|\ \ \
| * | | cvsserver: make the output of 'update' more compatible with cvs.Sergei Organov2009-12-311-0/+16
* | | | Merge branch 'bg/maint-add-all-doc'Junio C Hamano2010-01-072-29/+88
|\ \ \ \
| * | | | git-rm doc: Describe how to sync index & work treeBjörn Gustavsson2010-01-071-1/+53
| * | | | git-add/rm doc: Consistently back-quoteBjörn Gustavsson2009-12-072-15/+15
| * | | | Documentation: 'git add -A' can remove filesBjörn Gustavsson2009-12-071-13/+20
* | | | | Merge branch 'mv/commit-date'Junio C Hamano2010-01-075-2/+53
|\ \ \ \ \
| * | | | | Document date formats accepted by parse_date()Miklos Vajna2009-12-033-0/+29
| * | | | | builtin-commit: add --date optionMiklos Vajna2009-12-033-2/+24
* | | | | | Merge branch 'mo/bin-wrappers'Junio C Hamano2010-01-076-32/+93
|\ \ \ \ \ \
| * | | | | | INSTALL: document a simpler way to run uninstalled buildsMatthew Ogilvie2009-12-031-7/+11
| * | | | | | run test suite without dashed git-commands in PATHMatthew Ogilvie2009-12-032-12/+30
| * | | | | | build dashless "bin-wrappers" directory similar to installed bindirMatthew Ogilvie2009-12-033-13/+52
* | | | | | | .gitattributes: detect 8-space indent in shell scriptsJunio C Hamano2010-01-061-0/+1
* | | | | | | Makefile: make ppc/sha1ppc.o depend on GIT-CFLAGSJonathan Nieder2010-01-051-1/+1
* | | | | | | Use warning function instead of fprintf(stderr, "Warning: ...").Thiago Farina2010-01-034-7/+5
* | | | | | | Merge branch 'maint'Junio C Hamano2010-01-021-1/+1
|\ \ \ \ \ \ \
| * | | | | | | stash: mention --patch in usage string.Matthieu Moy2010-01-021-1/+1
* | | | | | | | Merge branch 'maint'Junio C Hamano2009-12-315-21/+37
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch 'maint-1.6.0' into maintJunio C Hamano2009-12-312-15/+17
| |\ \ \ \ \ \ \
| | * | | | | | | branch: die explicitly why when calling "git branch [-a|-r] branchname".Matthieu Moy2009-12-312-15/+17
| * | | | | | | | fast-import: Document author/committer/tagger name is optionalShawn O. Pearce2009-12-312-6/+6
| * | | | | | | | SubmittingPatches: hints to know the status of a submitted patch.Matthieu Moy2009-12-311-0/+14
* | | | | | | | | bash completion: add space between branch name and status flagsShawn O. Pearce2009-12-301-5/+2
* | | | | | | | | Add completion for git-svn mkdirs,reset,and gcRobert Zeh2009-12-301-2/+5
* | | | | | | | | Merge branch 'maint'Junio C Hamano2009-12-305-23/+34
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge branch 'maint-1.6.1' into maintJunio C Hamano2009-12-304-15/+19
| |\ \ \ \ \ \ \ \
| | * | | | | | | | textconv: stop leaking file descriptorsJeff King2009-12-301-0/+2
| | * | | | | | | | Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-12-292-9/+11
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /