summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* send-email: change --no-validate to boolean --[no-]validateMichael Witten2008-10-012-6/+12
* Docs: send-email: Man page option orderingMichael Witten2008-10-011-72/+66
* Docs: send-email usage text much sexierMichael Witten2008-10-011-68/+26
* Docs: send-email's usage text and man page mention same optionsMichael Witten2008-10-012-12/+17
* 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-303-5/+5
|\ \ | |/
| * git-svn: call 'fatal' correctly in set-treeLuc Heinrich2008-09-301-1/+1
| * Replace svn.foo.org with svn.example.com in git-svn docs (RFC 2606)Michael Prokop2008-09-301-4/+4
| * t0024: add executable permissionSZEDER Gábor2008-09-301-0/+0
* | diff.c: remove duplicate bibtex pattern introduced by merge 92bb9785Brandon Casey2008-09-301-2/+0
* | Use "git_config_string" to simplify "builtin-gc.c" code where "prune_expire" ...David Bryson2008-09-301-6/+3
* | tests: grep portability fixesJeff King2008-09-308-11/+11
* | Add OS X support to the pre-auto-gc example hookJonathan del Strother2008-09-301-3/+7
* | Correct typos in RelNotes-1.6.1Ralf Wildenhues2008-09-302-3/+3
* | remove vim syntax highlighting in favor of upstreamSZEDER Gábor2008-09-302-26/+30
* | Merge branch 'bc/master-diff-hunk-header-fix'Shawn O. Pearce2008-09-2915-120/+139
|\ \
| * \ Merge branch 'maint' into bc/master-diff-hunk-header-fixShawn O. Pearce2008-09-2952-196/+600
| |\ \ | | |/
| | * Merge branch 'bc/maint-diff-hunk-header-fix' into maintShawn O. Pearce2008-09-295-49/+72
| | |\
| | * \ Merge branch 'mg/maint-remote-fix' into maintShawn O. Pearce2008-09-291-8/+15
| | |\ \
| | | * | make "git remote" report multiple URLsMichael J Gruber2008-09-221-8/+15
| | * | | Clarify commit error message for unmerged filesRafael Garcia-Suarez2008-09-291-1/+1
| | * | | Use strchrnul() instead of strchr() plus manual workaroundJohan Herland2008-09-291-3/+1
| | * | | Use remove_path from dir.c instead of own implementationAlex Riesen2008-09-293-49/+5
| | * | | Add remove_path: a function to remove as much as possible of a pathAlex Riesen2008-09-292-0/+23
| | * | | git-submodule: Fix "Unable to checkout" for the initial 'update'Ping Yin2008-09-291-2/+7
| | * | | Clarify how the user can satisfy stash's 'dirty state' check.Stephen Haberman2008-09-291-1/+1
| * | | | t4018-diff-funcname: test syntax of builtin xfuncname patternsBrandon Casey2008-09-232-2/+2
| * | | | Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fixJunio C Hamano2008-09-221-0/+11
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | t4018-diff-funcname: test syntax of builtin xfuncname patternsBrandon Casey2008-09-221-0/+11
| * | | | Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fixJunio C Hamano2008-09-201-1/+3
| |\ \ \ \ | | |/ / /
| | * | | diff hunk pattern: fix misconverted "\{" tex macro introducersJunio C Hamano2008-09-201-2/+2
| * | | | diff: fix "multiple regexp" semantics to find hunk header commentJunio C Hamano2008-09-202-8/+11
| * | | | diff: use extended regexp to find hunk headersJunio C Hamano2008-09-191-3/+3
| * | | | Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fixJunio C Hamano2008-09-191-14/+17
| |\ \ \ \ | | |/ / /
| | * | | diff: use extended regexp to find hunk headersJunio C Hamano2008-09-191-14/+17
| * | | | Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fixJunio C Hamano2008-09-1837-123/+266
| |\ \ \ \ | | |/ / /
| | * | | diff.*.xfuncname which uses "extended" regex's for hunk header selectionBrandon Casey2008-09-183-3/+8
| | * | | diff.c: associate a flag with each pattern and use it for compiling regexBrandon Casey2008-09-183-12/+15
| | * | | diff.c: return pattern entry pointer rather than just the hunk header patternBrandon Casey2008-09-181-27/+28
| | | |/ | | |/|
* | | | Merge branch 'jc/better-conflict-resolution'Shawn O. Pearce2008-09-2913-119/+685
|\ \ \ \
| * | | | 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-313-48/+72
| * | | | checkout -m: recreate merge when checking out of unmerged indexJunio C Hamano2008-08-303-5/+173
| * | | | Merge branch 'jc/maint-checkout-fix' into 'jc/better-conflict-resolution'Junio C Hamano2008-08-303-24/+177
| |\ \ \ \
| | * | | | checkout --ours/--theirs: allow checking out one side of a conflicting mergeJunio C Hamano2008-08-303-3/+72
| | * | | | checkout -f: allow ignoring unmerged paths when checking out of the indexJunio C Hamano2008-08-303-24/+59
| * | | | | git-merge-recursive: learn to honor merge.conflictstyleJunio C Hamano2008-08-302-6/+14
View Lorry Controller Status