summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sb/show-ref-parse-options'Junio C Hamano2009-07-062-81/+67
|\
| * show-ref: migrate to parse-optionsStephen Boyd2009-06-202-81/+67
* | Merge branch 'gb/am-foreign'Junio C Hamano2009-07-061-4/+127
|\ \
| * | git-am: refactor 'cleaning up and aborting'Giuseppe Bilotta2009-06-131-14/+13
| * | git-am foreign patch support: StGIT supportGiuseppe Bilotta2009-05-281-0/+57
| * | git-am foreign patch support: autodetect some patch formatsGiuseppe Bilotta2009-05-281-1/+39
| * | git-am foreign patch support: introduce patch_formatGiuseppe Bilotta2009-05-281-4/+33
* | | Merge branch 'jk/use-our-regexp'Junio C Hamano2009-07-061-3/+11
|\ \ \
| * | | Makefile: Solaris needs HAVE_ALLOCA_H for alloca()Brandon Casey2009-06-201-1/+1
| * | | Makefile: use compat regex on SolarisJeff King2009-06-181-0/+1
| * | | Makefile: refactor regex compat supportJeff King2009-06-181-2/+9
* | | | Merge branch 'uk/rev-parse-parse-opt'Junio C Hamano2009-07-063-4/+52
|\ \ \ \
| * | | | parse-opt: make PARSE_OPT_STOP_AT_NON_OPTION available to git rev-parseUwe Kleine-König2009-06-133-2/+16
| * | | | more tests for git rev-parse --parse-optUwe Kleine-König2009-06-131-2/+36
* | | | | Avoid generating a warning if $fullname{$file} is undefinedNick Woolley2009-07-061-1/+2
* | | | | Remove archaic use of regex capture \1 in favour of $1Nick Woolley2009-07-061-1/+1
* | | | | completion: Add --full-diff to log optionsTodd Zullinger2009-07-061-1/+1
* | | | | Allow the Unix epoch to be a valid commit dateEric Wong2009-07-062-6/+2
* | | | | 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