summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix big left-shifts of unsigned charLinus Torvalds2009-06-188-16/+12
* Merge branch 'maint-1.6.2' into maintJunio C Hamano2009-06-131-33/+32
|\
| * Merge branch 'maint-1.6.1' into maint-1.6.2Junio C Hamano2009-06-131-33/+32
| |\
| | * Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-06-132-34/+34
| | |\
| | | * git-rerere.txt: grammatical fixups and cleanupsStephen Boyd2009-06-131-33/+32
* | | | 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
* | | | | 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
* | | | | 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
* | | | | 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
* | | | | 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
| * | | | | grep: fix word-regexp at the beginning of linesRené Scharfe2009-05-232-1/+9
* | | | | | Merge branch 'sb/maint-1.6.2-opt-filename-fix' into maintJunio C Hamano2009-06-026-0/+93
|\ \ \ \ \ \
| * | | | | | apply, fmt-merge-msg: use relative filenamesStephen Boyd2009-05-234-0/+79
| * | | | | | commit: -F overrides -tStephen Boyd2009-05-232-0/+14
* | | | | | | Merge branch 'jc/maint-add-p-coalesce-fix' into maintJunio C Hamano2009-06-022-1/+133
|\ \ \ \ \ \ \
| * | | | | | | t3701: ensure correctly set up repository after skipped testsJohannes Sixt2009-05-251-0/+6
| * | | | | | | Revert "git-add--interactive: remove hunk coalescing"Junio C Hamano2009-05-162-2/+96
| * | | | | | | Splitting a hunk that adds a line at the top fails in "add -p"Matt Graham2009-05-161-0/+32
* | | | | | | | 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
* | | | | | | | | fix segfault showing an empty remoteClemens Buchacher2009-05-272-4/+14
|/ / / / / / / /
* | | | | | | | Prepare for 1.6.3.2Junio C Hamano2009-05-252-1/+52
* | | | | | | | Merge branch 'js/maint-no-ln-across-libexec-and-bin' into maintJunio C Hamano2009-05-251-0/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Add NO_CROSS_DIRECTORY_HARDLINKS support to the MakefileJohannes Schindelin2009-05-131-0/+4
* | | | | | | | | Merge branch 'lt/maint-diff-reduce-lstat' into maintJunio C Hamano2009-05-252-3/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Teach 'git checkout' to preload the index contentsLinus Torvalds2009-05-091-2/+2
| * | | | | | | | | Avoid unnecessary 'lstat()' calls in 'get_stat_data()'Linus Torvalds2009-05-091-1/+1
* | | | | | | | | | Merge branch 'jm/format-patch-no-auto-n-when-k-is-given' into maintJunio C Hamano2009-05-252-1/+20
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | format-patch let -k override a config-specified format.numberedJim Meyering2009-05-092-1/+20
* | | | | | | | | | | Merge branch 'do/maint-merge-recursive-fix' into maintJunio C Hamano2009-05-252-5/+101
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | merge-recursive: never leave index unmerged while recursingDave Olszewski2009-05-092-5/+101
* | | | | | | | | | | | Merge branch 'jk/maint-1.6.0-trace-argv' into maintJunio C Hamano2009-05-251-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | fix GIT_TRACE segfault with shell-quoted aliasesJeff King2009-05-091-4/+4
* | | | | | | | | | | | | Merge branch 'np/push-delta' into maintJunio C Hamano2009-05-253-8/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | allow OFS_DELTA objects during a pushNicolas Pitre2009-05-013-8/+23
* | | | | | | | | | | | | | Merge branch 'ar/merge-one-file-diag' into maintJunio C Hamano2009-05-250-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Clarify kind of conflict in merge-one-file helperAlex Riesen2009-04-291-2/+9