summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Makefile: test-parse-options depends on parse-options.hJunio C Hamano2009-06-071-0/+2
* Merge branch 'maint'Junio C Hamano2009-06-064-6/+18
|\
| * Documentation: refer to gitworkflows(7) from tutorial and git(1)Thomas Rast2009-06-062-1/+8
| * daemon: Strictly parse the "extra arg" part of the commandShawn O. Pearce2009-06-062-5/+10
* | Documentation/git.txt: update links to release notesJunio C Hamano2009-06-031-1/+6
* | Merge branch 'maint' to sync with 1.6.3.2Junio C Hamano2009-06-032-8/+10
|\ \ | |/
| * GIT 1.6.3.2v1.6.3.2Junio C Hamano2009-06-032-8/+6
| * grep: fix empty word-regexp matchesRené Scharfe2009-06-031-1/+5
* | Show presence of stashed changes in bash prompt.Daniel Trstenjak2009-06-031-2/+10
* | Merge branch 'da/pretty-tempname'Junio C Hamano2009-06-0310-1/+177
|\ \
| * | diff: generate pretty filenames in prep_temp_blob()David Aguilar2009-05-314-1/+38
| * | compat: add a basename() compatibility functionDavid Aguilar2009-05-315-0/+37
| * | compat: add a mkstemps() compatibility functionDavid Aguilar2009-05-315-0/+102
* | | Clean up and simplify rev_compare_tree()Linus Torvalds2009-06-032-23/+15
* | | Merge branch 'maint'Junio C Hamano2009-06-037-39/+82
|\ \ \ | | |/ | |/|
| * | blame: correctly handle a path that used to be a directoryJunio C Hamano2009-06-032-8/+33
| * | add -i: do not dump patch during applicationThomas Rast2009-06-031-1/+0
| * | Update draft release notes for 1.6.3.2Junio C Hamano2009-06-021-14/+26
| * | Merge branch 'cb/maint-1.6.0-xdl-merge-fix' into maintJunio C Hamano2009-06-022-16/+21
| |\ \
| | * | Change xdl_merge to generate output even for null mergesCharles Bailey2009-05-242-17/+16
| | * | t6023: merge-file fails to output anything for a degenerate mergeCharles Bailey2009-05-241-0/+6
| * | | Merge branch 'rs/maint-grep-word-regexp-fix' into maintJunio C Hamano2009-06-022-1/+11
| |\ \ \
| | * | | grep: fix colouring of matches with zero lengthRené Scharfe2009-06-011-0/+2
| * | | | Merge branch 'sb/maint-1.6.2-opt-filename-fix' into maintJunio C Hamano2009-06-026-0/+93
| |\ \ \ \
| * \ \ \ \ Merge branch 'jc/maint-add-p-coalesce-fix' into maintJunio C Hamano2009-06-022-1/+133
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'tr/maint-doc-stash-pop' into maintJunio C Hamano2009-06-022-16/+18
| |\ \ \ \ \ \
| | * | | | | | Documentation: teach stash/pop workflow instead of stash/applyThomas Rast2009-05-282-16/+18
* | | | | | | | test-lib: fix http exit codesClemens Buchacher2009-06-011-2/+4
* | | | | | | | test-lib: allow exit trap to be used for cleanup by testsClemens Buchacher2009-06-011-7/+14
* | | | | | | | test-lib: fail if invalid options are passedClemens Buchacher2009-06-011-1/+1
* | | | | | | | git-show-branch.txt: document --date-order optionStephen Boyd2009-06-011-3/+9
* | | | | | | | Merge branch 'sb/opt-filename'Junio C Hamano2009-05-3152-96/+144
|\ \ \ \ \ \ \ \
| * | | | | | | | parse-opts: add OPT_FILENAME and transition builtinsStephen Boyd2009-05-259-33/+59
| * | | | | | | | parse-opts: prepare for OPT_FILENAMEStephen Boyd2009-05-2551-64/+86
| * | | | | | | | Merge branch 'jc/mktree' into sb/opt-filenameJunio C Hamano2009-05-257-135/+280
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'sb/format-patch-parseopt' into sb/opt-filenameJunio C Hamano2009-05-251-100/+160
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'sb/show-branch-parse-options' into sb/opt-filenameJunio C Hamano2009-05-253-71/+84
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into sb/opt-filenameJunio C Hamano2009-05-25448-6304/+16187
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'jc/solaris-0811'Junio C Hamano2009-05-312-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | OpenSolaris 200811 (SunOS 5.11) does not want OLD_ICONVJunio C Hamano2009-05-221-1/+3
| * | | | | | | | | | | | Teach Solaris that _XOPEN_SOURCE=600 really menas XPG6Junio C Hamano2009-05-221-0/+2
* | | | | | | | | | | | | Merge branch 'sb/show-branch-parse-options'Junio C Hamano2009-05-313-71/+84
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | show-branch: migrate to parse-options APIStephen Boyd2009-05-221-62/+63
| * | | | | | | | | | | | Merge branch 'mh/show-branch-color' into sb/show-branch-parse-optionsJunio C Hamano2009-05-224-5/+66
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | parse-options: add PARSE_OPT_LITERAL_ARGHELP for complicated argh'sStephen Boyd2009-05-222-9/+21
* | | | | | | | | | | | | | Merge branch 'mm/apply-double-slash'Junio C Hamano2009-05-311-6/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | apply: handle filenames with double slashes betterMichal Marek2009-05-241-6/+20
* | | | | | | | | | | | | | | Merge branch 'sb/format-patch-parseopt'Junio C Hamano2009-05-311-100/+160
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | format-patch: migrate to parse-options APIStephen Boyd2009-05-171-97/+158
* | | | | | | | | | | | | | | Merge branch 'jc/mktree'Junio C Hamano2009-05-317-135/+280
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | |
View Lorry Controller Status