Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
* | plug a few coverity-spotted leaks | Jim Meyering | 2011-06-20 | 3 | -1/+6 |
* | Merge branch 'maint' | Junio C Hamano | 2011-06-19 | 1 | -1/+1 |
|\ | |||||
| * | builtin/gc.c: add missing newline in message | Andreas Schwab | 2011-06-19 | 1 | -1/+1 |
* | | Merge branch 'maint' | Junio C Hamano | 2011-06-08 | 1 | -2/+4 |
|\ \ | |/ | |||||
| * | fetch: do not leak a refspec | Jim Meyering | 2011-06-08 | 1 | -2/+4 |
| * | Merge branch 'ab/i18n-fixup' into maint | Junio C Hamano | 2011-05-31 | 4 | -20/+32 |
| |\ | |||||
| * \ | Merge branch 'jc/rename-degrade-cc-to-c' into maint | Junio C Hamano | 2011-05-31 | 3 | -4/+21 |
| |\ \ | |||||
| * \ \ | Merge branch 'jk/cherry-pick-root-with-resolve' into maint | Junio C Hamano | 2011-05-26 | 2 | -5/+11 |
| |\ \ \ | |||||
| * | | | | Merge branch 'jk/git-connection-deadlock-fix' into maint | Junio C Hamano | 2011-05-26 | 1 | -0/+2 |
| * | | | | Merge branch 'js/maint-send-pack-stateless-rpc-deadlock-fix' into maint | Junio C Hamano | 2011-05-26 | 1 | -2/+7 |
* | | | | | Merge branch 'bc/maint-status-z-to-use-porcelain' | Junio C Hamano | 2011-06-06 | 1 | -3/+4 |
* | | | | | Merge branch 'jk/format-patch-am' | Junio C Hamano | 2011-05-31 | 8 | -28/+25 |
|\ \ \ \ \ | |||||
| * | | | | | format-patch: preserve subject newlines with -k | Jeff King | 2011-05-26 | 1 | -0/+1 |
| * | | | | | clean up calling conventions for pretty.c functions | Jeff King | 2011-05-26 | 4 | -13/+17 |
| * | | | | | pretty: add pp_commit_easy function for simple callers | Jeff King | 2011-05-26 | 5 | -12/+5 |
| * | | | | | mailinfo: always clean up rfc822 header folding | Jeff King | 2011-05-26 | 1 | -1/+1 |
* | | | | | | Merge branch 'jc/log-quiet-fix' | Junio C Hamano | 2011-05-31 | 1 | -0/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | log: --quiet should serve as synonym to -s | Junio C Hamano | 2011-05-28 | 1 | -0/+2 |
* | | | | | | | Merge branch 'jk/maint-remote-mirror-safer' | Junio C Hamano | 2011-05-31 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | remote: allow "-t" with fetch mirrors | Jeff King | 2011-05-26 | 1 | -2/+2 |
* | | | | | | | | Merge branch 'jl/read-tree-m-dry-run' | Junio C Hamano | 2011-05-31 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Teach read-tree the -n|--dry-run option | Jens Lehmann | 2011-05-25 | 1 | -1/+2 |
* | | | | | | | | | Merge branch 'mk/grep-pcre' | Junio C Hamano | 2011-05-30 | 1 | -9/+43 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | git-grep: do not die upon -F/-P when grep.extendedRegexp is set. | Junio C Hamano | 2011-05-09 | 1 | -13/+43 |
| * | | | | | | | | | git-grep: Bail out when -P is used with -F or -E | Michał Kiedrowicz | 2011-05-09 | 1 | -1/+3 |
| * | | | | | | | | | git-grep: Learn PCRE | Michał Kiedrowicz | 2011-05-09 | 1 | -0/+2 |
* | | | | | | | | | | Merge branch 'jc/notes-batch-removal' | Junio C Hamano | 2011-05-29 | 2 | -22/+43 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | show: --ignore-missing | Junio C Hamano | 2011-05-19 | 1 | -0/+1 |
| * | | | | | | | | | | notes remove: --stdin reads from the standard input | Junio C Hamano | 2011-05-19 | 1 | -4/+15 |
| * | | | | | | | | | | notes remove: --ignore-missing | Junio C Hamano | 2011-05-19 | 1 | -4/+10 |
| * | | | | | | | | | | notes remove: allow removing more than one | Junio C Hamano | 2011-05-19 | 1 | -22/+25 |
* | | | | | | | | | | | Merge branch 'jk/haves-from-alternate-odb' | Junio C Hamano | 2011-05-29 | 2 | -4/+14 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | receive-pack: eliminate duplicate .have refs | Jeff King | 2011-05-19 | 1 | -3/+13 |
| * | | | | | | | | | | | refactor refs_from_alternate_cb to allow passing extra data | Jeff King | 2011-05-19 | 2 | -2/+2 |
* | | | | | | | | | | | | Merge branch 'jk/fetch-mark-complete-optimization' | Junio C Hamano | 2011-05-26 | 1 | -2/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | fetch: avoid repeated commits in mark_complete | Jeff King | 2011-05-19 | 1 | -2/+4 |
| |/ / / / / / / / / / / | |||||
* | | | | | | | | | | | | Merge branch 'jc/bigfile' | Junio C Hamano | 2011-05-25 | 2 | -2/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | index_fd(): turn write_object and format_check arguments into one flag | Junio C Hamano | 2011-05-09 | 2 | -2/+6 |