summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ph/submodule-rebase' (early part)Junio C Hamano2009-06-134-6/+192
|\
| * Rename submodule.<name>.rebase to submodule.<name>.updateJohan Herland2009-06-034-27/+35
| * git-submodule: add support for --rebase.Peter Hutterer2009-04-244-6/+184
* | Merge branch 'bc/solaris'Junio C Hamano2009-06-136-8/+90
|\ \
| * | configure: test whether -lresolv is neededRalf Wildenhues2009-06-102-0/+10
| * | Makefile: insert SANE_TOOL_PATH to PATH before /bin or /usr/binJunio C Hamano2009-06-102-4/+31
| * | git-compat-util.h: avoid using c99 flex array feature with Sun compiler 5.8Brandon Casey2009-06-081-1/+1
| * | Makefile: add section for SunOS 5.7Brandon Casey2009-06-061-0/+10
| * | Makefile: introduce SANE_TOOL_PATH for prepending required elements to PATHJunio C Hamano2009-06-062-0/+16
| * | Makefile: define __sun__ on SunOSBrandon Casey2009-06-061-1/+1
| * | git-compat-util.h: tweak the way _XOPEN_SOURCE is set on SolarisBrandon Casey2009-06-061-1/+14
| * | On Solaris choose the OLD_ICONV iconv() declaration based on the UNIX specBrandon Casey2009-06-062-2/+2
| * | Makefile: add NEEDS_RESOLV to optionally add -lresolv to compile argumentsBrandon Casey2009-06-061-1/+10
| * | Makefile: use /usr/ucb/install on SunOS platforms rather than ginstallBrandon Casey2009-05-281-1/+1
* | | Merge branch 'cb/match_refs_internal_tail'Junio C Hamano2009-06-136-29/+23
|\ \ \
| * | | match_refs: search ref list tail internallyClemens Buchacher2009-06-016-29/+23
* | | | Merge branch 'nw/maint-cvsexportcommit'Junio C Hamano2009-06-132-14/+53
|\ \ \ \
| * | | | git-cvsexportcommit can't commit files which have been removed from CVSNick Woolley2009-05-282-14/+53
* | | | | Merge branch 'da/araxis-mergetool'Junio C Hamano2009-06-135-6/+27
|\ \ \ \ \
| * | | | | mergetool--lib: add support for araxis mergeDavid Aguilar2009-05-245-6/+27
* | | | | | Merge branch 'maint'Junio C Hamano2009-06-112-1/+5
|\ \ \ \ \ \
| * | | | | | Documentation: git-send-mail can take rev-list arg to drive format-patchPaolo Bonzini2009-06-111-0/+4
| * | | | | | Merge branch 'uk/maint-1.5.3-rebase-i-reflog' into maintJunio C Hamano2009-06-111-1/+1
| |\ \ \ \ \ \
| | * | | | | | rebase--interactive: remote stray closing parenthesisUwe Kleine-König2009-06-111-1/+1
* | | | | | | | 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