Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jc/fetch-pack-fsck-objects' | Junio C Hamano | 2011-10-05 | 4 | -5/+151 |
|\ | |||||
| * | test: fetch/receive with fsckobjectsjc/fetch-pack-fsck-objects | Junio C Hamano | 2011-09-04 | 1 | -0/+104 |
| * | transfer.fsckobjects: unify fetch/receive.fsckobjects | Junio C Hamano | 2011-09-04 | 3 | -7/+35 |
| * | fetch.fsckobjects: verify downloaded objects | Junio C Hamano | 2011-09-04 | 2 | -0/+14 |
* | | Merge branch 'jc/traverse-commit-list' | Junio C Hamano | 2011-10-05 | 4 | -29/+46 |
|\ \ | |||||
| * | | revision.c: update show_object_with_name() without using malloc() | Junio C Hamano | 2011-08-22 | 1 | -14/+36 |
| * | | revision.c: add show_object_with_name() helper function | Junio C Hamano | 2011-08-22 | 4 | -28/+23 |
| * | | 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 | 14 | -171/+960 |
|\ \ \ | |||||
| * | | | 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 | 5 | -4/+287 |
| * | | | revert: Don't implicitly stomp pending sequencer operation | Ramkumar Ramachandra | 2011-08-08 | 2 | -5/+34 |
| * | | | revert: Remove sequencer state when no commits are pending | Ramkumar Ramachandra | 2011-08-08 | 2 | -1/+35 |
| * | | | reset: Make reset remove the sequencer state | Ramkumar Ramachandra | 2011-08-08 | 2 | -0/+46 |
| * | | | revert: Introduce --reset to remove sequencer state | Ramkumar Ramachandra | 2011-08-04 | 8 | -20/+111 |
| * | | | 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 | 2 | -2/+60 |
| * | | | revert: Save data for continuing after conflict resolution | Ramkumar Ramachandra | 2011-08-04 | 2 | -4/+178 |
| * | | | 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 |
| * | | | config: Introduce functions to write non-standard file | Ramkumar Ramachandra | 2011-08-04 | 2 | -9/+29 |
| * | | | advice: Introduce error_resolve_conflict | Ramkumar Ramachandra | 2011-08-04 | 3 | -17/+26 |
* | | | | Merge branch 'da/make-auto-header-dependencies' | Junio C Hamano | 2011-10-05 | 1 | -3/+3 |
|\ \ \ \ | |||||
| * | | | | Makefile: Improve compiler header dependency check | David Aguilar | 2011-08-30 | 1 | -3/+3 |
* | | | | | Merge branch 'gb/am-hg-patch' | Junio C Hamano | 2011-10-05 | 1 | -0/+34 |
|\ \ \ \ \ | |||||
| * | | | | | am: preliminary support for hg patches | Giuseppe Bilotta | 2011-08-29 | 1 | -0/+34 |
* | | | | | | Merge branch 'bc/unstash-clean-crufts' | Junio C Hamano | 2011-10-05 | 2 | -16/+36 |
|\ \ \ \ \ \ | |||||
| * | | | | | | git-stash: remove untracked/ignored directories when stashedbc/unstash-clean-crufts | Brandon Casey | 2011-08-27 | 2 | -4/+24 |
| * | | | | | | t/t3905: add missing '&&' linkage | Brandon Casey | 2011-08-27 | 1 | -3/+3 |
| * | | | | | | git-stash.sh: fix typo in error message | Brandon Casey | 2011-08-27 | 1 | -1/+1 |
| * | | | | | | t/t3905: use the name 'actual' for test output, swap arguments to test_cmp | Brandon Casey | 2011-08-27 | 1 | -12/+12 |
* | | | | | | | Merge branch 'fk/make-auto-header-dependencies' | Junio C Hamano | 2011-10-05 | 1 | -4/+9 |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| * | | | | | | Makefile: Use computed header dependencies if the compiler supports itfk/make-auto-header-dependencies | Fredrik Kuivinen | 2011-08-18 | 1 | -4/+9 |
* | | | | | | | 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 | 4 | -5/+10 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Teach progress eye-candy to fetch_refs_from_bundle() | Junio C Hamano | 2011-09-19 | 4 | -5/+10 |
* | | | | | | | | | Merge branch 'jk/filter-branch-require-clean-work-tree' | Junio C Hamano | 2011-10-05 | 1 | -3/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | filter-branch: use require_clean_work_tree | Jeff King | 2011-09-15 | 1 | -3/+1 |
* | | | | | | | | | | Merge branch 'jc/want-commit' | Junio C Hamano | 2011-10-05 | 2 | -11/+14 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Allow git merge ":/<pattern>"jc/want-commit | Junio C Hamano | 2011-09-15 | 2 | -11/+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 'bk/ancestry-path' | Junio C Hamano | 2011-10-05 | 3 | -10/+101 |
|\ \ \ \ \ \ \ \ \ \ \ |