summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/traverse-commit-list'Junio C Hamano2011-10-051-15/+2
|\
| * revision.c: add show_object_with_name() helper functionJunio C Hamano2011-08-221-14/+1
| * rev-list: fix finish_object() callJunio C Hamano2011-08-221-1/+1
* | Merge branch 'rr/revert-cherry-pick-continue'Junio C Hamano2011-10-051-154/+583
|\ \
| * | 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-081-4/+184
| * | revert: Don't implicitly stomp pending sequencer operationRamkumar Ramachandra2011-08-081-5/+25
| * | revert: Remove sequencer state when no commits are pendingRamkumar Ramachandra2011-08-081-1/+11
| * | revert: Introduce --reset to remove sequencer stateRamkumar Ramachandra2011-08-041-19/+43
| * | 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-041-0/+33
| * | revert: Save data for continuing after conflict resolutionRamkumar Ramachandra2011-08-041-4/+130
| * | 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
| * | advice: Introduce error_resolve_conflictRamkumar Ramachandra2011-08-041-9/+0
* | | Merge branch 'ms/patch-id-with-overlong-line'Junio C Hamano2011-10-051-4/+6
|\ \ \
| * | | patch-id.c: use strbuf instead of a fixed bufferMichael Schubert2011-09-221-4/+6
| |/ /
* | | Merge branch 'jc/maint-bundle-too-quiet'Junio C Hamano2011-10-051-1/+1
|\ \ \
| * | | Teach progress eye-candy to fetch_refs_from_bundle()Junio C Hamano2011-09-191-1/+1
* | | | Merge branch 'jc/want-commit'Junio C Hamano2011-10-051-5/+14
|\ \ \ \
| * | | | Allow git merge ":/<pattern>"jc/want-commitJunio C Hamano2011-09-151-5/+14
| | |/ / | |/| |
* | | | Merge branch 'jc/maint-fsck-fwrite-size-check'Junio C Hamano2011-10-051-6/+3
|\ \ \ \
| * | | | fsck: do not abort upon finding an empty blobJunio C Hamano2011-09-111-6/+3
* | | | | Merge branch 'nm/grep-object-sha1-lock'Junio C Hamano2011-10-051-0/+3
* | | | | Merge branch 'ci/forbid-unwanted-current-branch-update'Junio C Hamano2011-09-162-2/+3
|\ \ \ \ \
| * | | | | branch --set-upstream: regression fixJunio C Hamano2011-09-162-2/+3
* | | | | | Merge branch 'ph/format-patch-no-color'Junio C Hamano2011-09-141-1/+2
|\ \ \ \ \ \
| * | | | | | format-patch: ignore ui.colorPang Yan Han2011-09-121-1/+2
* | | | | | | Sync with 1.7.6.3Junio C Hamano2011-09-121-6/+9
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jl/maint-fetch-submodule-check-fix' into maintJunio C Hamano2011-09-121-6/+9
| |\ \ \ \ \ \ \
| | * | | | | | | fetch: skip on-demand checking when no submodules are configuredJens Lehmann2011-09-091-6/+9
| | | |_|_|/ / / | | |/| | | | |
| * | | | | | | Merge branch 'ms/reflog-show-is-default' into maintJunio C Hamano2011-09-111-2/+1
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jk/reset-reflog-message-fix' into maintJunio C Hamano2011-09-111-33/+16
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jk/tag-contains-ab' (early part) into maintJunio C Hamano2011-09-111-1/+45
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'mh/check-ref-format-print-normalize'Junio C Hamano2011-09-061-3/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | check-ref-format --print: Normalize refnames that start with slashesMichael Haggerty2011-08-251-3/+3
* | | | | | | | | | | Sync with 1.7.6.2Junio C Hamano2011-09-062-21/+4
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Revert "Merge branch 'cb/maint-quiet-push' into maint"Junio C Hamano2011-09-062-21/+4
* | | | | | | | | | | Merge branch 'jc/clean-exclude-doc'Junio C Hamano2011-09-021-2/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Documentation: clarify "git clean -e <pattern>"Junio C Hamano2011-08-281-2/+3
* | | | | | | | | | | | Merge branch 'fg/submodule-ff-check-before-push'Junio C Hamano2011-09-021-0/+19
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | push: Don't push a repository with unpushed submodulesFredrik Gustafsson2011-08-201-0/+19
* | | | | | | | | | | | | Merge branch 'nd/decorate-grafts'Junio C Hamano2011-08-281-0/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Move write_shallow_commits to fetch-pack.cNguyễn Thái Ngọc Duy2011-08-181-0/+30
| | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | |