summaryrefslogtreecommitdiff
path: root/Documentation
AgeCommit message (Expand)AuthorFilesLines
2008-09-18Merge branch 'jc/maint-checkout-keep-remove' into maintLibravatar Junio C Hamano1-1/+10
2008-09-18Clarified gitattributes documentation regarding custom hunk header.Libravatar Garry Dolley1-9/+9
2008-09-16Merge branch 'jc/maint-checkout-keep-remove'Libravatar Junio C Hamano1-1/+10
2008-09-12Sync with 1.6.0.2Libravatar Junio C Hamano4-5/+6
2008-09-12GIT 1.6.0.2Libravatar Junio C Hamano1-1/+3
2008-09-12Fix some manual typos.Libravatar Ralf Wildenhues3-3/+3
2008-09-10allow installation of man and html doc from the man and html branchesLibravatar Michael J Gruber1-0/+4
2008-09-10Merge branch 'maint'Libravatar Junio C Hamano1-2/+22
2008-09-10Update draft release notes for 1.6.0.2Libravatar Junio C Hamano1-2/+22
2008-09-09checkout: do not lose staged removalLibravatar Junio C Hamano1-1/+10
2008-09-07Merge branch 'ar/autospell'Libravatar Junio C Hamano1-0/+9
2008-09-07Teach "git diff -p" to locate PHP class methodsLibravatar Andreas Ericsson1-2/+4
2008-09-06Update draft release notes for 1.6.1Libravatar Junio C Hamano1-2/+7
2008-09-06git-apply:--include=pathspecLibravatar Junio C Hamano1-1/+13
2008-09-06Merge branch 'maint'Libravatar Junio C Hamano2-3/+25
2008-09-06Update draft release notes for 1.6.0.2Libravatar Junio C Hamano1-3/+20
2008-09-05for-each-ref: `:short` format for `refname`Libravatar Bert Wesarg1-0/+1
2008-09-05diff --dirstat-by-file: count changed files, not linesLibravatar Heikki Orsila1-0/+3
2008-09-05Mention the fact that 'git annotate' is only for backward compatibility.Libravatar Junio C Hamano1-0/+5
2008-09-04add '%d' pretty format specifier to show decorationLibravatar René Scharfe1-0/+1
2008-09-04Fix AsciiDoc errors in merge documentationLibravatar Johan Herland1-4/+4
2008-09-03Update draft release notes for 1.6.1Libravatar Junio C Hamano1-1/+58
2008-09-03Merge branch 'maint'Libravatar Junio C Hamano4-6/+56
2008-09-03Start 1.6.0.2 maintenance cycleLibravatar Junio C Hamano1-0/+50
2008-09-03Fix passwd(5) ref and reflect that commit doens't use commit-treeLibravatar Jonas Fonseca3-6/+6
2008-09-02Merge branch 'tr/filter-branch'Libravatar Junio C Hamano1-0/+42
2008-09-02Merge branch 'rf/man-env'Libravatar Junio C Hamano1-1/+3
2008-09-02Merge branch 'jc/author-nickname'Libravatar Junio C Hamano1-2/+4
2008-09-02Merge branch 'maint'Libravatar Junio C Hamano3-15/+14
2008-09-01Improve documentation for --dirstat diff optionLibravatar Heikki Orsila1-6/+5
2008-09-01Documentation: minor cleanup in a use case in 'git stash' manualLibravatar SZEDER Gábor1-1/+1
2008-09-01Documentation: fix disappeared lines in 'git stash' manpageLibravatar SZEDER Gábor1-7/+7
2008-09-01Documentation: fix reference to a for-each-ref optionLibravatar SZEDER Gábor1-1/+1
2008-08-31git-merge documentation: describe how conflict is presentedLibravatar Junio C Hamano1-0/+65
2008-08-31checkout --conflict=<style>: recreate merge in a non-default styleLibravatar Junio C Hamano1-1/+9
2008-08-31Merge branch 'maint'Libravatar Junio C Hamano4-3/+6
2008-08-31Document sendemail.envelopesender configurationLibravatar Ask Bjørn Hansen1-0/+3
2008-08-31Document clarification: gitmodules, gitattributesLibravatar Gustaf Hendeby2-2/+2
2008-08-31Add help.autocorrect to enable/disable autocorrectingLibravatar Alex Riesen1-0/+9
2008-08-30config.txt: Add missing colons after option nameLibravatar Teemu Likonen1-1/+1
2008-08-30git commit --author=$name: look $name up in existing commitsLibravatar Junio C Hamano1-2/+4
2008-08-30diff: vary default prefix depending on what are comparedLibravatar Junio C Hamano1-0/+16
2008-08-30Merge branch 'maint'Libravatar Junio C Hamano2-4/+38
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