summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* parse-remote: function to get the tracking branch to be mergeSanti Béjar2009-06-112-5/+31
* parse-options: add parse_options_check to validate option specs.Pierre Habouzit2009-06-101-0/+24
* git-repack.txt: Clarify implications of -a for dumb protocolsMichael J Gruber2009-06-091-2/+5
* Merge branch 'maint'Junio C Hamano2009-06-093-4/+10
|\
| * diff.c: plug a memory leak in an error pathJohannes Sixt2009-06-081-0/+1
| * fetch-pack: close output channel after sideband demultiplexer terminatesJohannes Sixt2009-06-081-1/+3
| * builtin-remote: Make "remote show" display all urlsMichael J Gruber2009-06-081-3/+6
* | bash: add support for 'git stash pop --index' optionSZEDER Gábor2009-06-091-2/+2
* | Documentation: mention 'git stash pop --index' option explicitlySZEDER Gábor2009-06-092-10/+10
* | Simplify some 'fprintf(stderr); return -1;' by using 'return error()'Johannes Sixt2009-06-091-10/+6
* | Simplify some instances of run_command() by using run_command_v_opt().Johannes Sixt2009-06-093-45/+18
* | show-branch: don't use LASTARG_DEFAULT with OPTARGStephen Boyd2009-06-092-4/+6
* | send-email: use UTF-8 rather than utf-8 for consistencyBrandon Casey2009-06-092-6/+6
* | git-send-email.perl: improve detection of MIME encoded-wordsBrandon Casey2009-06-091-1/+9
* | symlinks.c: small style cleanupKjetil Barvik2009-06-071-4/+2
* | 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
| |\ \ \ \ \ \ \ \
View Lorry Controller Status