summaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Expand)AuthorAgeFilesLines
* Documentation: remove stale howto/rebase-and-edit.txtThomas Rast2008-10-121-79/+0
* Merge branch 'js/objc-funchdr'Shawn O. Pearce2008-10-091-0/+2
|\
| * Teach git diff about Objective-C syntaxJonathan del Strother2008-10-061-0/+2
* | Merge branch 'dm/svn-branch'Shawn O. Pearce2008-10-091-1/+23
|\ \
| * | Add git-svn branch to allow branch creation in SVN repositoriesFlorian Ragwitz2008-10-061-1/+23
| |/
* | Merge branch 'dp/cywginstat'Shawn O. Pearce2008-10-091-0/+9
|\ \
| * | cygwin: Use native Win32 API for statDmitry Potapov2008-09-301-0/+9
* | | Merge branch 'mw/sendemail'Shawn O. Pearce2008-10-091-139/+103
|\ \ \
| * | | send-email: signedoffcc -> signedoffbycc, but handle bothMichael Witten2008-10-011-1/+1
| * | | Docs: send-email: Create logical groupings for man textMichael Witten2008-10-011-50/+69
| * | | Docs: send-email: Remove unnecessary config variable descriptionMichael Witten2008-10-011-75/+16
| * | | Docs: send-email: --chain_reply_to -> --[no-]chain-reply-toMichael Witten2008-10-011-1/+1
| * | | send-email: change --no-validate to boolean --[no-]validateMichael Witten2008-10-011-2/+7
| * | | Docs: send-email: Man page option orderingMichael Witten2008-10-011-72/+66
| * | | Docs: send-email's usage text and man page mention same optionsMichael Witten2008-10-011-8/+13
* | | | Merge branch 'rz/grepz'Shawn O. Pearce2008-10-091-0/+6
|\ \ \ \
| * | | | git grep: Add "-z/--null" option as in GNU's grep.Raphael Zimmerer2008-10-011-0/+6
| |/ / /
* | | | Merge branch 'mg/verboseprune'Shawn O. Pearce2008-10-091-1/+4
|\ \ \ \
| * | | | make prune report removed objects on -vMichael J Gruber2008-09-301-1/+4
| | |/ / | |/| |
* | | | Merge branch 'maint'Shawn O. Pearce2008-10-082-9/+23
|\ \ \ \ | |_|_|/ |/| | |
| * | | git-push.txt: Describe --repo option in more detailJohannes Sixt2008-10-081-5/+19
| * | | Fix a few typos in relnotesMikael Magnusson2008-10-071-4/+4
* | | | Merge branch 'maint'Shawn O. Pearce2008-10-062-1/+58
|\ \ \ \ | |/ / /
| * | | Update release notes for 1.6.0.3Shawn O. Pearce2008-10-061-1/+51
| * | | docs: describe pre-rebase hookNanako Shiraishi2008-10-061-0/+7
* | | | run-command.c: remove run_command_v_opt_cd()Nanako Shiraishi2008-10-021-1/+1
| |_|/ |/| |
* | | Merge branch 'maint'Shawn O. Pearce2008-10-013-9/+12
|\ \ \ | |/ / | | / | |/ |/|
| * Improve git-log documentation wrt file filtersmartin f. krafft2008-10-011-3/+6
| * Documentation: remove '\' in front of short optionsSZEDER Gábor2008-10-012-6/+6
* | Merge branch 'maint'Shawn O. Pearce2008-09-301-4/+4
|\ \ | |/
| * Replace svn.foo.org with svn.example.com in git-svn docs (RFC 2606)Michael Prokop2008-09-301-4/+4
* | Correct typos in RelNotes-1.6.1Ralf Wildenhues2008-09-302-3/+3
* | Merge branch 'bc/master-diff-hunk-header-fix'Shawn O. Pearce2008-09-291-2/+2
|\ \
| * \ Merge branch 'maint' into bc/master-diff-hunk-header-fixShawn O. Pearce2008-09-296-46/+98
| |\ \ | | |/
| | * Merge branch 'bc/maint-diff-hunk-header-fix' into maintShawn O. Pearce2008-09-291-2/+2
| | |\
| * | \ Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fixJunio C Hamano2008-09-185-9/+30
| |\ \ \ | | | |/ | | |/|
| | * | diff.*.xfuncname which uses "extended" regex's for hunk header selectionBrandon Casey2008-09-181-2/+2
* | | | Merge branch 'jc/better-conflict-resolution'Shawn O. Pearce2008-09-293-7/+107
|\ \ \ \
| * | | | Fix AsciiDoc errors in merge documentationJohan Herland2008-09-041-4/+4
| * | | | git-merge documentation: describe how conflict is presentedJunio C Hamano2008-08-311-0/+65
| * | | | checkout --conflict=<style>: recreate merge in a non-default styleJunio C Hamano2008-08-311-1/+9
| * | | | checkout -m: recreate merge when checking out of unmerged indexJunio C Hamano2008-08-301-3/+8
| * | | | Merge branch 'jc/maint-checkout-fix' into 'jc/better-conflict-resolution'Junio C Hamano2008-08-301-6/+20
| |\ \ \ \
| | * | | | checkout --ours/--theirs: allow checking out one side of a conflicting mergeJunio C Hamano2008-08-301-2/+9
| | * | | | checkout -f: allow ignoring unmerged paths when checking out of the indexJunio C Hamano2008-08-301-6/+13
| * | | | | merge.conflictstyle: choose between "merge" and "diff3 -m" stylesJunio C Hamano2008-08-301-0/+8
| |/ / / /
* | | | | Merge branch 'maint'Shawn O. Pearce2008-09-261-2/+11
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Documentation: clarify the details of overriding LESS via core.pagerChris Frey2008-09-261-2/+11
* | | | | Merge branch 'jc/apply-include-exclude'Shawn O. Pearce2008-09-251-1/+13
|\ \ \ \ \
| * | | | | git-apply:--include=pathspecJunio C Hamano2008-09-061-1/+13
View Lorry Controller Status