summaryrefslogtreecommitdiff
path: root/Documentation
AgeCommit message (Expand)AuthorFilesLines
2008-08-30gitattributes: -crlf is not binaryLibravatar Junio C Hamano1-3/+37
2008-08-30checkout -m: recreate merge when checking out of unmerged indexLibravatar Junio C Hamano1-3/+8
2008-08-30Merge branch 'jc/maint-checkout-fix' into 'jc/better-conflict-resolution'Libravatar Junio C Hamano1-6/+20
2008-08-30merge.conflictstyle: choose between "merge" and "diff3 -m" stylesLibravatar Junio C Hamano1-0/+8
2008-08-30checkout --ours/--theirs: allow checking out one side of a conflicting mergeLibravatar Junio C Hamano1-2/+9
2008-08-30checkout -f: allow ignoring unmerged paths when checking out of the indexLibravatar Junio C Hamano1-6/+13
2008-08-30Fix example in git-name-rev documentationLibravatar Junio C Hamano1-1/+1
2008-08-30Merge branch 'sb/daemon'Libravatar Junio C Hamano1-2/+7
2008-08-29builtin-help: fallback to GIT_MAN_VIEWER before manLibravatar Romain Francoise1-1/+3
2008-08-29Merge branch 'maint'Libravatar Junio C Hamano3-2/+36
2008-08-29tutorial: gentler illustration of Alice/Bob workflow using gitkLibravatar Paolo Ciarrocchi1-1/+28
2008-08-29pretty=format: respect date format optionsLibravatar Jeff King1-1/+1
2008-08-29Document gitk --argscmd flag.Libravatar Yann Dirson1-0/+7
2008-08-25git-submodule: add "sync" commandLibravatar David Aguilar1-0/+9
2008-08-24Merge branch 'maint' to sync with 1.6.0.1Libravatar Junio C Hamano3-13/+27
2008-08-24GIT 1.6.0.1Libravatar Junio C Hamano1-6/+11
2008-08-24Documentation: clarify pager configurationLibravatar Jonathan Nieder2-3/+9
2008-08-24Documentation: clarify pager.<cmd> configurationLibravatar Jonathan Nieder1-3/+5
2008-08-22git-merge documentation: more details about resolving conflictsLibravatar Dan Hensgen1-6/+18
2008-08-22Extend "checkout --track" DWIM to support more casesLibravatar Alex Riesen1-3/+10
2008-08-20Teach "git diff -p" HTML funcname patternsLibravatar Johan Herland1-0/+2
2008-08-20Teach "git diff -p" Python funcname patternsLibravatar Kirill Smelkov1-0/+2
2008-08-20Merge branch 'ml/submodule-foreach'Libravatar Junio C Hamano1-0/+17
2008-08-20Merge branch 'kh/diff-tree'Libravatar Junio C Hamano1-5/+14
2008-08-20Merge branch 'mg/count-objects'Libravatar Junio C Hamano1-2/+3
2008-08-20Merge branch 'cc/merge-base-many'Libravatar Junio C Hamano1-11/+66
2008-08-20Update draft release notes for 1.6.1Libravatar Junio C Hamano1-5/+21
2008-08-20Merge branch 'maint'Libravatar Junio C Hamano2-2/+27
2008-08-20Update draft release notes for 1.6.0.1Libravatar Junio C Hamano1-2/+18
2008-08-20Add hints to revert documentation about other ways to undo changesLibravatar Tarmigan Casebolt1-0/+9
2008-08-19Merge branch 'dp/hash-literally'Libravatar Junio C Hamano1-1/+19
2008-08-19Merge branch 'js/checkout-dwim-local'Libravatar Junio C Hamano1-1/+9
2008-08-19Merge branch 'rs/imap'Libravatar Junio C Hamano1-12/+66
2008-08-19reword --full-index descriptionLibravatar Jim Meyering1-3/+3
2008-08-19SubmittingPatches: fix a typoLibravatar Jim Meyering1-1/+1
2008-08-19add boolean diff.suppress-blank-empty config optionLibravatar Jim Meyering1-0/+4
2008-08-19Merge branch 'maint'Libravatar Junio C Hamano1-4/+4
2008-08-18adapt git-cvsserver manpage to dash-free syntaxLibravatar Robert Schiele1-4/+4
2008-08-17git-daemon: rewrite kindergarden, new option --max-connectionsLibravatar Stephen R. van den Berg1-2/+7
2008-08-17git-submodule - Add 'foreach' subcommandLibravatar Mark Levedahl1-0/+17
2008-08-17Start 1.6.1 cycleLibravatar Junio C Hamano1-0/+42
2008-08-17Start 1.6.0.X maintenance seriesLibravatar Junio C Hamano1-0/+15
2008-08-17GIT 1.6.0Libravatar Junio C Hamano2-12/+16
2008-08-17count-objects: Add total pack size to verbose outputLibravatar Marcus Griep1-2/+3
2008-08-16Documentation: document the pager.* configuration settingLibravatar Miklos Vajna1-0/+5
2008-08-16git-stash: improve synopsis in help and manual pageLibravatar Stephan Beyer1-3/+10
2008-08-16git-am: ignore --binary optionLibravatar Stephan Beyer1-6/+1
2008-08-14git format-patch documentation: clarify what --cover-letter doesLibravatar Matt McCutchen1-3/+3
2008-08-12GIT 1.6.0-rc3Libravatar Junio C Hamano1-2/+2
2008-08-12Merge branch 'maint'Libravatar Junio C Hamano1-0/+2