summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/unpack-trees-reword'Junio C Hamano2008-05-253-14/+52
|\
| * unpack-trees: allow Porcelain to give different error messagesJunio C Hamano2008-05-193-14/+52
* | Merge branch 'ar/batch-cat'Junio C Hamano2008-05-259-82/+781
|\ \
| * | change quoting in test t1006-cat-file.shMichele Ballabio2008-05-231-3/+3
| * | builtin-cat-file.c: use parse_options()Michele Ballabio2008-05-231-73/+46
| * | git-svn: Speed up fetchAdam Roben2008-05-231-22/+20
| * | Git.pm: Add hash_and_insert_object and cat_blobAdam Roben2008-05-231-2/+150
| * | Git.pm: Add command_bidi_pipe and command_close_bidi_pipeAdam Roben2008-05-231-0/+56
| * | git-hash-object: Add --stdin-paths optionAdam Roben2008-05-233-2/+80
| * | Add more tests for git hash-objectAdam Roben2008-05-231-27/+93
| * | Move git-hash-object tests from t5303 to t1007Adam Roben2008-05-231-0/+0
| * | git-cat-file: Add --batch optionAdam Roben2008-05-053-38/+117
| * | git-cat-file: Add --batch-check optionAdam Roben2008-05-053-7/+163
| * | git-cat-file: Make option parsing a little more flexibleAdam Roben2008-05-051-12/+30
| * | git-cat-file: Small refactor of cmd_cat_fileAdam Roben2008-05-051-16/+22
| * | Add tests for git cat-fileAdam Roben2008-05-051-0/+121
* | | Merge branch 'cc/bisect'Junio C Hamano2008-05-252-61/+116
|\ \ \
| * | | bisect: use a detached HEAD to bisectChristian Couder2008-05-222-47/+45
| * | | bisect: trap critical errors in "bisect_start"Christian Couder2008-05-222-12/+28
| * | | bisect: fix left over "BISECT_START" file when starting with junk revChristian Couder2008-05-222-10/+8
| * | | bisect: add test cases to check that "git bisect start" is atomicChristian Couder2008-05-221-0/+43
* | | | Merge branch 'ap/svn'Junio C Hamano2008-05-253-1/+93
|\ \ \ \
| * | | | git-svn: add test for --add-author-from and --use-log-authorJunio C Hamano2008-05-121-0/+70
| * | | | git-svn: add documentation for --add-author-from option.Avery Pennarun2008-05-041-0/+6
| * | | | git-svn: Add --add-author-from option.Avery Pennarun2008-05-041-1/+13
| * | | | git-svn: add documentation for --use-log-author option.Avery Pennarun2008-05-041-0/+4
| | |/ / | |/| |
* | | | Merge branch 'js/cvsexportcommit'Junio C Hamano2008-05-253-7/+55
|\ \ \ \
| * | | | cvsexportcommit: introduce -W for shared working trees (between Git and CVS)Johannes Schindelin2008-05-153-6/+53
| * | | | cvsexportcommit: chomp only removes trailing whitespaceJohannes Schindelin2008-05-151-1/+2
* | | | | Merge branch 'js/ignore-submodule'Junio C Hamano2008-05-2511-12/+132
|\ \ \ \ \
| * | | | | Ignore dirty submodule states during rebase and stashJohannes Schindelin2008-05-154-12/+105
| * | | | | Teach update-index about --ignore-submodulesJohannes Schindelin2008-05-154-0/+14
| * | | | | diff options: Introduce --ignore-submodulesJohannes Schindelin2008-05-153-0/+13
| |/ / / /
* | | | | Merge branch 'mo/cvsserver'Junio C Hamano2008-05-254-69/+826
|\ \ \ \ \
| * | | | | Documentation: Fix skipped section levelGustaf Hendeby2008-05-211-1/+1
| * | | | | git-cvsserver: add ability to guess -kb from contentsMatthew Ogilvie2008-05-164-25/+354
| * | | | | implement gitcvs.usecrlfattrMatthew Ogilvie2008-05-164-22/+276
| * | | | | git-cvsserver: add mechanism for managing working tree and current directoryMatthew Ogilvie2008-05-161-39/+213
| |/ / / /
* | | | | http-push: remove remote locks on exit signalsClemens Buchacher2008-05-251-0/+22
* | | | | Reset the signal being handledClemens Buchacher2008-05-251-1/+1
* | | | | Make git-cvsimport remove ['s from tags, as bad_ref_char doesn't allow them.Paul Oliver2008-05-251-0/+1
* | | | | Documentation: convert tutorials to man pagesChristian Couder2008-05-247-24/+87
* | | | | CodingGuidelines: Add a note to avoid assignments inside if()Miklos Vajna2008-05-241-0/+2
* | | | | Remove redundant code, eliminate one static variableHeikki Orsila2008-05-241-27/+17
* | | | | Merge git://git.kernel.org/pub/scm/gitk/gitkJunio C Hamano2008-05-232-23/+29
|\ \ \ \ \
| * | | | | gitk: Fix bug introduced by "gitk: Fix "wrong # coordinates" error on reload"Paul Mackerras2008-05-221-1/+3
| * | | | | gitk: Fix bug where current row number display stops workingPaul Mackerras2008-05-201-23/+23
| * | | | | gitk: Move es.po where it belongsMichele Ballabio2008-05-191-0/+0
| * | | | | gitk: Fix "wrong # coordinates" error on reloadPaul Mackerras2008-05-191-0/+4
* | | | | | Merge branch 'pb/push'Junio C Hamano2008-05-236-35/+116
|\ \ \ \ \ \