summaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Expand)AuthorAgeFilesLines
* Reword "detached HEAD" notificationJunio C Hamano2010-01-291-0/+5
* Documentation: move away misplaced 'push --upstream' descriptionThomas Rast2010-01-241-7/+7
* Documentation: add missing :: in config.txtThomas Rast2010-01-241-1/+1
* Merge branch 'doc-style/for-next' of git://repo.or.cz/git/trastJunio C Hamano2010-01-243-80/+102
|\
| * Documentation: merge: use MERGE_HEAD to refer to the remote branchJonathan Nieder2010-01-241-6/+8
| * Documentation: simplify How Merge WorksJonathan Nieder2010-01-241-36/+16
| * Documentation: merge: add a section about fast-forwardJonathan Nieder2010-01-241-13/+18
| * Documentation: emphasize when git merge terminates earlyJonathan Nieder2010-01-241-10/+21
| * 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: rev-list: fix synopsys for --tags and and --remotesChristian Couder2010-01-231-2/+2
* | git-svn: allow subset of branches/tags to be specified in glob specJay Soffian2010-01-231-0/+16
* | git-svn: allow UUID to be manually remapped via rewriteUUIDJay Soffian2010-01-231-3/+12
* | git-svn: document --username/commit-url for branch/tagIgor Mironov2010-01-231-0/+13
* | Update draft release notes to 1.7.0Junio C Hamano2010-01-221-1/+26
* | Merge branch 'il/rev-glob'Junio C Hamano2010-01-224-17/+52
|\ \
| * | Documentation: improve description of --glob=pattern and friendsThomas Rast2010-01-211-17/+15
| * | rev-parse --branches/--tags/--remotes=patternIlari Liusvaara2010-01-204-17/+30
| * | rev-parse --globIlari Liusvaara2010-01-204-0/+24
* | | Merge branch 'js/refer-upstream'Junio C Hamano2010-01-221-0/+4
|\ \ \
| * | | Introduce <branch>@{upstream} notationJohannes Schindelin2010-01-121-0/+4
* | | | Merge branch 'il/remote-updates'Junio C Hamano2010-01-221-0/+17
|\ \ \ \
| * | | | Add git remote set-urlIlari Liusvaara2010-01-181-0/+17
* | | | | Merge branch 'il/branch-set-upstream'Junio C Hamano2010-01-221-1/+7
|\ \ \ \ \
| * | | | | Add branch --set-upstreamIlari Liusvaara2010-01-181-1/+7
| |/ / / /
* | | | | Merge branch 'jc/maint-limit-note-output'Junio C Hamano2010-01-221-0/+8
|\ \ \ \ \
| * | | | | Fix "log --oneline" not to show notesJunio C Hamano2010-01-211-2/+2
| * | | | | Fix "log" family not to be too agressive about showing notesJunio C Hamano2010-01-201-0/+8
* | | | | | git-rebase.txt: Fix spellingHorst H. von Brand2010-01-211-1/+1
* | | | | | conflict-marker-size: add test and docsJunio C Hamano2010-01-201-0/+17
* | | | | | Update draft release notes to 1.7.0Junio C Hamano2010-01-201-1/+45
* | | | | | Merge branch 'ap/merge-backend-opts'Junio C Hamano2010-01-203-3/+43
|\ \ \ \ \ \
| * | | | | | Document that merge strategies can now take their own optionsJunio C Hamano2010-01-172-1/+33
| * | | | | | git-merge-file --ours, --theirsJunio C Hamano2009-11-291-2/+10
* | | | | | | Merge remote branch 'remotes/trast-doc/for-next'Junio C Hamano2010-01-20116-685/+693
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | 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
* | | | | | | Merge branch 'rr/core-tutorial'Junio C Hamano2010-01-201-0/+8
|\ \ \ \ \ \ \
| * | | | | | | Documentation: Update git core tutorial clarifying reference to scriptsRamkumar Ramachandra2010-01-161-0/+8
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'jc/grep-lookahead'Junio C Hamano2010-01-201-8/+0
|\ \ \ \ \ \ \
| * | | | | | | grep: rip out support for external grepJunio C Hamano2010-01-131-8/+0
| |/ / / / / /
* | | | | | | Merge branch 'mm/conflict-advice'Junio C Hamano2010-01-201-0/+4
|\ \ \ \ \ \ \
View Lorry Controller Status