summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* http-push: fix xml_entities() string parsing overrunHunter, D. Seth2009-07-061-0/+2
* Remove filename from conflict markersMartin Renold2009-07-014-13/+17
* Merge branch 'cc/bisect'Junio C Hamano2009-07-013-16/+43
|\
| * Documentation: remove warning saying that "git bisect skip" may slow bisectionChristian Couder2009-06-131-3/+2
| * bisect: use a PRNG with a bias when skipping away from untestable commitsChristian Couder2009-06-132-13/+41
* | Merge branch 'js/daemon-log'Junio C Hamano2009-07-013-40/+76
|\ \
| * | receive-pack: do not send error details to the clientJohannes Sixt2009-06-211-31/+22
| * | upload-pack: squelch progress indicator if client cannot see itJohannes Sixt2009-06-181-1/+6
| * | daemon: send stderr of service programs to the syslogJohannes Sixt2009-06-181-8/+48
* | | Merge branch 'cf/maint-remote-uploadpack-useconfig-fix'Junio C Hamano2009-07-011-1/+1
|\ \ \
| * | | git-remote: fix missing .uploadpack usage for show commandChris Frey2009-06-251-1/+1
* | | | Merge branch 'sb/quiet-porcelains'Junio C Hamano2009-07-0112-74/+225
|\ \ \ \
| * | | | stash: teach quiet optionStephen Boyd2009-06-183-24/+92
| * | | | am, rebase: teach quiet optionStephen Boyd2009-06-186-24/+97
| * | | | submodule, repack: migrate to git-sh-setup's say()Stephen Boyd2009-06-182-25/+11
| * | | | git-sh-setup: introduce say() for quiet optionsStephen Boyd2009-06-181-0/+9
| * | | | am: suppress apply errors when using 3-wayStephen Boyd2009-06-181-1/+8
| * | | | t4150: test applying with a newline in subjectStephen Boyd2009-06-181-0/+8
| | |/ / | |/| |
* | | | Merge branch 'ne/maint-1.6.0-diff-tree-t-r-show-directory'Junio C Hamano2009-07-012-0/+59
|\ \ \ \
| * | | | diff-tree -r -t: include added/removed directories in the outputNick Edelen2009-06-132-0/+59
* | | | | Merge branch 'maint'Junio C Hamano2009-07-011-3/+4
|\ \ \ \ \
| * | | | | request-pull: really really disable pagerMichal Marek2009-07-011-3/+4
* | | | | | log-tree: fix confusing commentJeff King2009-07-011-1/+2
* | | | | | Merge branch 'maint'Junio C Hamano2009-06-306-17/+21
|\ \ \ \ \ \ | |/ / / / /
| * | | | | attr: plug minor memory leakRené Scharfe2009-06-301-0/+2
| * | | | | request-pull: really disable pagerJunio C Hamano2009-06-301-2/+2
| * | | | | Makes some cleanup/review in gittutorialThadeu Lima de Souza Cascardo2009-06-301-12/+12
| * | | | | Makefile: git.o depends on library headersJohannes Sixt2009-06-301-1/+1
| * | | | | git-submodule documentation: fix foreach exampleMiklos Vajna2009-06-302-2/+4
* | | | | | git.c: avoid allocating one-too-many elements for new argv arrayBrandon Casey2009-06-301-2/+1
* | | | | | git-mv: fix directory separator treatment on WindowsJohannes Sixt2009-06-301-7/+3
* | | | | | completion: add missing config variablesStephen Boyd2009-06-301-2/+3
* | | | | | git log: add '--merges' flag to match '--no-merges'Linus Torvalds2009-06-292-0/+5
* | | | | | Merge git://git.bogomips.org/git-svnJunio C Hamano2009-06-275-42/+446
|\ \ \ \ \ \
| * | | | | | git svn: Doc update for multiple branch and tag pathsMarc Branchaud2009-06-271-9/+35
| * | | | | | git svn: cleanup t9138-multiple-branchesMarc Branchaud2009-06-271-57/+66
| * | | | | | git-svn: Canonicalize svn urls to prevent libsvn assertionUlrich Dangel2009-06-261-1/+8
| * | | | | | t9138: remove stray dot in test which broke bashEric Wong2009-06-261-1/+0
| * | | | | | git-svn: convert globs to regexps for branch destinationsEric Wong2009-06-251-1/+3
| * | | | | | git svn: Support multiple branch and tag paths in the svn repository.Marc Branchaud2009-06-252-22/+170
| * | | | | | Add 'git svn reset' to unwind 'git svn fetch'Ben Jackson2009-06-253-6/+164
| * | | | | | git-svn: speed up find_rev_beforeBen Jackson2009-06-251-0/+2
| * | | | | | Add 'git svn help [cmd]' which works outside a repo.Ben Jackson2009-06-251-0/+3
| * | | | | | git-svn: let 'dcommit $rev' work on $rev instead of HEADThomas Rast2009-06-253-4/+54
* | | | | | | Merge branch 'pb/send-email-cccmd-fix'Junio C Hamano2009-06-271-1/+4
|\ \ \ \ \ \ \
| * | | | | | | t/t9001-send-email.sh: ensure generated script is executed with $SHELL_PATHBrandon Casey2009-06-231-1/+4
* | | | | | | | Merge branch 'maint'Junio C Hamano2009-06-274-2/+44
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | gitweb/README: fix AliasMatch in exampleGiuseppe Bilotta2009-06-271-1/+9
| * | | | | | | Test grep --and/--or/--notThomas Rast2009-06-271-0/+30
| * | | | | | | Test git archive --remoteThomas Rast2009-06-271-0/+4
| | |_|_|_|/ / | |/| | | | |