summaryrefslogtreecommitdiff
path: root/Documentation
AgeCommit message (Expand)AuthorFilesLines
2010-01-24Documentation: simplify How Merge WorksLibravatar Jonathan Nieder1-36/+16
2010-01-24Documentation: merge: add a section about fast-forwardLibravatar Jonathan Nieder1-13/+18
2010-01-24Documentation: emphasize when git merge terminates earlyLibravatar Jonathan Nieder1-10/+21
2010-01-24Documentation: merge: add an overviewLibravatar Jonathan Nieder1-2/+26
2010-01-24Documentation: merge: move merge strategy list to endLibravatar Jonathan Nieder1-2/+2
2010-01-24Documentation: suggest `reset --merge` in How Merge Works sectionLibravatar Jonathan Nieder1-3/+3
2010-01-24Documentation: merge: move configuration section to endLibravatar Jonathan Nieder1-9/+9
2010-01-23Documentation: rev-list: fix synopsys for --tags and and --remotesLibravatar Christian Couder1-2/+2
2010-01-23git-svn: allow subset of branches/tags to be specified in glob specLibravatar Jay Soffian1-0/+16
2010-01-23git-svn: allow UUID to be manually remapped via rewriteUUIDLibravatar Jay Soffian1-3/+12
2010-01-23git-svn: document --username/commit-url for branch/tagLibravatar Igor Mironov1-0/+13
2010-01-22Update draft release notes to 1.7.0Libravatar Junio C Hamano1-1/+26
2010-01-22Merge branch 'il/rev-glob'Libravatar Junio C Hamano4-17/+52
2010-01-22Merge branch 'js/refer-upstream'Libravatar Junio C Hamano1-0/+4
2010-01-22Merge branch 'il/remote-updates'Libravatar Junio C Hamano1-0/+17
2010-01-22Merge branch 'il/branch-set-upstream'Libravatar Junio C Hamano1-1/+7
2010-01-22Merge branch 'jc/maint-limit-note-output'Libravatar Junio C Hamano1-0/+8
2010-01-21Documentation: improve description of --glob=pattern and friendsLibravatar Thomas Rast1-17/+15
2010-01-21git-rebase.txt: Fix spellingLibravatar Horst H. von Brand1-1/+1
2010-01-21Fix "log --oneline" not to show notesLibravatar Junio C Hamano1-2/+2
2010-01-20conflict-marker-size: add test and docsLibravatar Junio C Hamano1-0/+17
2010-01-20Update draft release notes to 1.7.0Libravatar Junio C Hamano1-1/+45
2010-01-20Merge branch 'ap/merge-backend-opts'Libravatar Junio C Hamano3-3/+43
2010-01-20Merge remote branch 'remotes/trast-doc/for-next'Libravatar Junio C Hamano116-685/+693
2010-01-20Fix "log" family not to be too agressive about showing notesLibravatar Junio C Hamano1-0/+8
2010-01-20Merge branch 'rr/core-tutorial'Libravatar Junio C Hamano1-0/+8
2010-01-20Merge branch 'jc/grep-lookahead'Libravatar Junio C Hamano1-8/+0
2010-01-20Merge branch 'mm/conflict-advice'Libravatar Junio C Hamano1-0/+4
2010-01-20Merge branch 'da/difftool'Libravatar Junio C Hamano2-1/+20
2010-01-20Merge branch 'ns/rebase-auto-squash'Libravatar Junio C Hamano1-0/+10
2010-01-20Merge branch 'mh/rebase-fixup' (early part)Libravatar Junio C Hamano1-5/+8
2010-01-20Merge branch 'il/push-set-upstream'Libravatar Junio C Hamano1-1/+8
2010-01-20Merge branch 'jk/warn-author-committer-after-commit'Libravatar Junio C Hamano3-0/+16
2010-01-20Merge branch 'sd/cd-p-show-toplevel'Libravatar Junio C Hamano1-0/+3
2010-01-20Sync with 1.6.6.1Libravatar Junio C Hamano3-8/+45
2010-01-20Git 1.6.6.1Libravatar Junio C Hamano2-7/+15
2010-01-20Merge branch 'bg/maint-add-all-doc' into maintLibravatar Junio C Hamano2-29/+88
2010-01-20Merge branch 'maint-1.6.5' into maintLibravatar Junio C Hamano2-1/+30
2010-01-20Git 1.6.5.8Libravatar Junio C Hamano2-1/+30
2010-01-20rev-parse --branches/--tags/--remotes=patternLibravatar Ilari Liusvaara4-17/+30
2010-01-20rev-parse --globLibravatar Ilari Liusvaara4-0/+24
2010-01-18Update draft release notes to 1.7.0Libravatar Junio C Hamano1-1/+16
2010-01-18Merge branch 'maint'Libravatar Junio C Hamano1-1/+16
2010-01-18Update draft release notes to 1.6.6.1Libravatar Junio C Hamano1-1/+16
2010-01-18Merge branch 'jc/rerere'Libravatar Junio C Hamano1-1/+6
2010-01-18Add branch --set-upstreamLibravatar Ilari Liusvaara1-1/+7
2010-01-18Add git remote set-urlLibravatar Ilari Liusvaara1-0/+17
2010-01-17Document that merge strategies can now take their own optionsLibravatar Junio C Hamano2-1/+33
2010-01-17Update draft release notes to 1.7.0Libravatar Junio C Hamano1-1/+38
2010-01-17Merge branch 'jh/commit-status'Libravatar Junio C Hamano2-1/+18