summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* receive-pack, fetch-pack: reject bogus pack that records objects twicejc/index-pack-reject-dupsJunio C Hamano2011-11-164-2/+11
* Merge branch 'jc/receive-verify'Junio C Hamano2011-10-055-56/+141
|\
| * receive-pack: check connectivity before concluding "git push"Junio C Hamano2011-09-091-0/+43
| * check_everything_connected(): libifyJunio C Hamano2011-09-094-65/+85
| * check_everything_connected(): refactor to use an iteratorJunio C Hamano2011-09-091-14/+36
| * fetch: verify we have everything we need before updating our refJunio C Hamano2011-09-091-56/+63
* | Merge branch 'jc/fetch-verify'Junio C Hamano2011-10-059-77/+107
|\ \
| * | fetch: verify we have everything we need before updating our refJunio C Hamano2011-09-011-56/+63
| |/
| * rev-list --verify-objectJunio C Hamano2011-09-013-0/+10
| * list-objects: pass callback data to show_objects()Junio C Hamano2011-09-015-19/+32
* | Merge branch 'jc/fetch-pack-fsck-objects'Junio C Hamano2011-10-054-5/+151
|\ \
| * | test: fetch/receive with fsckobjectsjc/fetch-pack-fsck-objectsJunio C Hamano2011-09-041-0/+104
| * | transfer.fsckobjects: unify fetch/receive.fsckobjectsJunio C Hamano2011-09-043-7/+35
| * | fetch.fsckobjects: verify downloaded objectsJunio C Hamano2011-09-042-0/+14
* | | Merge branch 'jc/traverse-commit-list'Junio C Hamano2011-10-054-29/+46
|\ \ \ | | |/ | |/|
| * | revision.c: update show_object_with_name() without using malloc()Junio C Hamano2011-08-221-14/+36
| * | revision.c: add show_object_with_name() helper functionJunio C Hamano2011-08-224-28/+23
| * | rev-list: fix finish_object() callJunio C Hamano2011-08-221-1/+1
* | | Merge branch 'rr/revert-cherry-pick-continue'Junio C Hamano2011-10-0514-171/+960
|\ \ \
| * | | builtin/revert.c: make commit_list_append() staticJunio C Hamano2011-09-111-2/+2
| * | | revert: Propagate errors upwards from do_pick_commitRamkumar Ramachandra2011-08-081-46/+40
| * | | revert: Introduce --continue to continue the operationRamkumar Ramachandra2011-08-085-4/+287
| * | | revert: Don't implicitly stomp pending sequencer operationRamkumar Ramachandra2011-08-082-5/+34
| * | | revert: Remove sequencer state when no commits are pendingRamkumar Ramachandra2011-08-082-1/+35
| * | | reset: Make reset remove the sequencer stateRamkumar Ramachandra2011-08-082-0/+46
| * | | revert: Introduce --reset to remove sequencer stateRamkumar Ramachandra2011-08-048-20/+111
| * | | revert: Make pick_commits functionally act on a commit listRamkumar Ramachandra2011-08-041-15/+28
| * | | revert: Save command-line options for continuing operationRamkumar Ramachandra2011-08-042-2/+60
| * | | revert: Save data for continuing after conflict resolutionRamkumar Ramachandra2011-08-042-4/+178
| * | | revert: Don't create invalid replay_opts in parse_argsRamkumar Ramachandra2011-08-041-11/+27
| * | | revert: Separate cmdline parsing from functional codeRamkumar Ramachandra2011-08-041-7/+7
| * | | revert: Introduce struct to keep command-line optionsRamkumar Ramachandra2011-08-041-88/+113
| * | | revert: Eliminate global "commit" variableRamkumar Ramachandra2011-08-041-11/+11
| * | | revert: Rename no_replay to record_originRamkumar Ramachandra2011-08-041-4/+4
| * | | revert: Don't check lone argument in get_encodingRamkumar Ramachandra2011-08-041-3/+0
| * | | revert: Simplify and inline add_message_to_msgRamkumar Ramachandra2011-08-041-14/+14
| * | | config: Introduce functions to write non-standard fileRamkumar Ramachandra2011-08-042-9/+29
| * | | advice: Introduce error_resolve_conflictRamkumar Ramachandra2011-08-043-17/+26
* | | | Merge branch 'da/make-auto-header-dependencies'Junio C Hamano2011-10-051-3/+3
|\ \ \ \
| * | | | Makefile: Improve compiler header dependency checkDavid Aguilar2011-08-301-3/+3
* | | | | Merge branch 'gb/am-hg-patch'Junio C Hamano2011-10-051-0/+34
|\ \ \ \ \
| * | | | | am: preliminary support for hg patchesGiuseppe Bilotta2011-08-291-0/+34
* | | | | | Merge branch 'bc/unstash-clean-crufts'Junio C Hamano2011-10-052-16/+36
|\ \ \ \ \ \
| * | | | | | git-stash: remove untracked/ignored directories when stashedbc/unstash-clean-cruftsBrandon Casey2011-08-272-4/+24
| * | | | | | t/t3905: add missing '&&' linkageBrandon Casey2011-08-271-3/+3
| * | | | | | git-stash.sh: fix typo in error messageBrandon Casey2011-08-271-1/+1
| * | | | | | t/t3905: use the name 'actual' for test output, swap arguments to test_cmpBrandon Casey2011-08-271-12/+12
* | | | | | | Merge branch 'fk/make-auto-header-dependencies'Junio C Hamano2011-10-051-4/+9
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Makefile: Use computed header dependencies if the compiler supports itfk/make-auto-header-dependenciesFredrik Kuivinen2011-08-181-4/+9
* | | | | | | Merge branch 'ms/patch-id-with-overlong-line'Junio C Hamano2011-10-051-4/+6
|\ \ \ \ \ \ \