Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jc/traverse-commit-list' | Junio C Hamano | 2011-10-05 | 1 | -15/+2 |
|\ | |||||
| * | revision.c: add show_object_with_name() helper function | Junio C Hamano | 2011-08-22 | 1 | -14/+1 |
| * | rev-list: fix finish_object() call | Junio C Hamano | 2011-08-22 | 1 | -1/+1 |
* | | Merge branch 'rr/revert-cherry-pick-continue' | Junio C Hamano | 2011-10-05 | 1 | -154/+583 |
|\ \ | |||||
| * | | builtin/revert.c: make commit_list_append() static | Junio C Hamano | 2011-09-11 | 1 | -2/+2 |
| * | | revert: Propagate errors upwards from do_pick_commit | Ramkumar Ramachandra | 2011-08-08 | 1 | -46/+40 |
| * | | revert: Introduce --continue to continue the operation | Ramkumar Ramachandra | 2011-08-08 | 1 | -4/+184 |
| * | | revert: Don't implicitly stomp pending sequencer operation | Ramkumar Ramachandra | 2011-08-08 | 1 | -5/+25 |
| * | | revert: Remove sequencer state when no commits are pending | Ramkumar Ramachandra | 2011-08-08 | 1 | -1/+11 |
| * | | revert: Introduce --reset to remove sequencer state | Ramkumar Ramachandra | 2011-08-04 | 1 | -19/+43 |
| * | | revert: Make pick_commits functionally act on a commit list | Ramkumar Ramachandra | 2011-08-04 | 1 | -15/+28 |
| * | | revert: Save command-line options for continuing operation | Ramkumar Ramachandra | 2011-08-04 | 1 | -0/+33 |
| * | | revert: Save data for continuing after conflict resolution | Ramkumar Ramachandra | 2011-08-04 | 1 | -4/+130 |
| * | | revert: Don't create invalid replay_opts in parse_args | Ramkumar Ramachandra | 2011-08-04 | 1 | -11/+27 |
| * | | revert: Separate cmdline parsing from functional code | Ramkumar Ramachandra | 2011-08-04 | 1 | -7/+7 |
| * | | revert: Introduce struct to keep command-line options | Ramkumar Ramachandra | 2011-08-04 | 1 | -88/+113 |
| * | | revert: Eliminate global "commit" variable | Ramkumar Ramachandra | 2011-08-04 | 1 | -11/+11 |
| * | | revert: Rename no_replay to record_origin | Ramkumar Ramachandra | 2011-08-04 | 1 | -4/+4 |
| * | | revert: Don't check lone argument in get_encoding | Ramkumar Ramachandra | 2011-08-04 | 1 | -3/+0 |
| * | | revert: Simplify and inline add_message_to_msg | Ramkumar Ramachandra | 2011-08-04 | 1 | -14/+14 |
| * | | advice: Introduce error_resolve_conflict | Ramkumar Ramachandra | 2011-08-04 | 1 | -9/+0 |
* | | | Merge branch 'ms/patch-id-with-overlong-line' | Junio C Hamano | 2011-10-05 | 1 | -4/+6 |
|\ \ \ | |||||
| * | | | patch-id.c: use strbuf instead of a fixed buffer | Michael Schubert | 2011-09-22 | 1 | -4/+6 |
| |/ / | |||||
* | | | Merge branch 'jc/maint-bundle-too-quiet' | Junio C Hamano | 2011-10-05 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Teach progress eye-candy to fetch_refs_from_bundle() | Junio C Hamano | 2011-09-19 | 1 | -1/+1 |
* | | | | Merge branch 'jc/want-commit' | Junio C Hamano | 2011-10-05 | 1 | -5/+14 |
|\ \ \ \ | |||||
| * | | | | Allow git merge ":/<pattern>"jc/want-commit | Junio C Hamano | 2011-09-15 | 1 | -5/+14 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'jc/maint-fsck-fwrite-size-check' | Junio C Hamano | 2011-10-05 | 1 | -6/+3 |
|\ \ \ \ | |||||
| * | | | | fsck: do not abort upon finding an empty blob | Junio C Hamano | 2011-09-11 | 1 | -6/+3 |
* | | | | | Merge branch 'nm/grep-object-sha1-lock' | Junio C Hamano | 2011-10-05 | 1 | -0/+3 |
* | | | | | Merge branch 'ci/forbid-unwanted-current-branch-update' | Junio C Hamano | 2011-09-16 | 2 | -2/+3 |
|\ \ \ \ \ | |||||
| * | | | | | branch --set-upstream: regression fix | Junio C Hamano | 2011-09-16 | 2 | -2/+3 |
* | | | | | | Merge branch 'ph/format-patch-no-color' | Junio C Hamano | 2011-09-14 | 1 | -1/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | format-patch: ignore ui.color | Pang Yan Han | 2011-09-12 | 1 | -1/+2 |
* | | | | | | | Sync with 1.7.6.3 | Junio C Hamano | 2011-09-12 | 1 | -6/+9 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'jl/maint-fetch-submodule-check-fix' into maint | Junio C Hamano | 2011-09-12 | 1 | -6/+9 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | fetch: skip on-demand checking when no submodules are configured | Jens Lehmann | 2011-09-09 | 1 | -6/+9 |
| | | |_|_|/ / / | | |/| | | | | | |||||
| * | | | | | | | Merge branch 'ms/reflog-show-is-default' into maint | Junio C Hamano | 2011-09-11 | 1 | -2/+1 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'jk/reset-reflog-message-fix' into maint | Junio C Hamano | 2011-09-11 | 1 | -33/+16 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'jk/tag-contains-ab' (early part) into maint | Junio C Hamano | 2011-09-11 | 1 | -1/+45 |
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'mh/check-ref-format-print-normalize' | Junio C Hamano | 2011-09-06 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | check-ref-format --print: Normalize refnames that start with slashes | Michael Haggerty | 2011-08-25 | 1 | -3/+3 |
* | | | | | | | | | | | Sync with 1.7.6.2 | Junio C Hamano | 2011-09-06 | 2 | -21/+4 |
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | Revert "Merge branch 'cb/maint-quiet-push' into maint" | Junio C Hamano | 2011-09-06 | 2 | -21/+4 |
* | | | | | | | | | | | Merge branch 'jc/clean-exclude-doc' | Junio C Hamano | 2011-09-02 | 1 | -2/+3 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Documentation: clarify "git clean -e <pattern>" | Junio C Hamano | 2011-08-28 | 1 | -2/+3 |
* | | | | | | | | | | | | Merge branch 'fg/submodule-ff-check-before-push' | Junio C Hamano | 2011-09-02 | 1 | -0/+19 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | push: Don't push a repository with unpushed submodules | Fredrik Gustafsson | 2011-08-20 | 1 | -0/+19 |
* | | | | | | | | | | | | | Merge branch 'nd/decorate-grafts' | Junio C Hamano | 2011-08-28 | 1 | -0/+30 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Move write_shallow_commits to fetch-pack.c | Nguyễn Thái Ngọc Duy | 2011-08-18 | 1 | -0/+30 |
| | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | |