Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jk/repack-no-explode-objects-from-old-pack' | Junio C Hamano | 2012-04-29 | 2 | -49/+65 |
|\ | |||||
| * | gc: use argv-array for sub-commands | Jeff King | 2012-04-18 | 1 | -45/+33 |
| * | gc: do not explode objects which will be immediately pruned | Jeff King | 2012-04-11 | 2 | -10/+38 |
* | | Merge branch 'jc/merge-reduce-parents-early' | Junio C Hamano | 2012-04-27 | 2 | -63/+207 |
|\ \ | |||||
| * | | fmt-merge-msg: discard needless merge parents | Junio C Hamano | 2012-04-18 | 1 | -9/+119 |
| * | | builtin/merge.c: reduce parents early | Junio C Hamano | 2012-04-17 | 1 | -25/+40 |
| * | | builtin/merge.c: collect other parents early | Junio C Hamano | 2012-04-17 | 1 | -13/+27 |
| * | | builtin/merge.c: remove "remoteheads" global variable | Junio C Hamano | 2012-04-17 | 1 | -23/+28 |
* | | | Merge branch 'cb/cherry-pick-rev-path-confusion' | Junio C Hamano | 2012-04-27 | 1 | -1/+4 |
|\ \ \ | |||||
| * | | | cherry-pick: do not expect file arguments | Clemens Buchacher | 2012-04-15 | 1 | -1/+4 |
| | |/ | |/| | |||||
* | | | Merge branch 'mb/fetch-call-a-non-branch-a-ref' | Junio C Hamano | 2012-04-26 | 1 | -4/+13 |
|\ \ \ | |||||
| * | | | fetch: describe new refs based on where it came from | Marc Branchaud | 2012-04-17 | 1 | -3/+11 |
| * | | | fetch: Give remote_ref to update_local_ref() as well | Marc Branchaud | 2012-04-17 | 1 | -1/+2 |
| | |/ | |/| | |||||
* | | | Merge branch 'cc/fix-missing-va-end-in-revert' | Junio C Hamano | 2012-04-24 | 1 | -0/+1 |
|\ \ \ | |||||
| * | | | revert: add missing va_end | Christian Couder | 2012-04-21 | 1 | -0/+1 |
* | | | | Merge branch 'it/fetch-pack-many-refs' | Junio C Hamano | 2012-04-24 | 1 | -1/+41 |
|\ \ \ \ | |||||
| * | | | | fetch-pack: new --stdin option to read refs from stdin | Ivan Todoroski | 2012-04-02 | 1 | -1/+41 |
* | | | | | Merge branch 'hv/submodule-recurse-push' | Junio C Hamano | 2012-04-24 | 1 | -1/+9 |
|\ \ \ \ \ | |||||
| * | | | | | push: teach --recurse-submodules the on-demand option | Heiko Voigt | 2012-03-30 | 1 | -1/+9 |
* | | | | | | Merge branch 'jl/maint-submodule-recurse-fetch' | Junio C Hamano | 2012-04-23 | 1 | -3/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | submodules: recursive fetch also checks new tags for submodule commits | Jens Lehmann | 2012-04-14 | 1 | -3/+3 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge branch 'jc/maint-blame-minimal' | Junio C Hamano | 2012-04-23 | 1 | -0/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | blame: accept --need-minimal | Junio C Hamano | 2012-04-11 | 1 | -0/+1 |
| * | | | | | | Merge branch 'tr/cache-tree' into maint-1.7.8 | Junio C Hamano | 2012-04-09 | 2 | -4/+10 |
| |\ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ | Merge branch 'jh/apply-free-patch' | Junio C Hamano | 2012-04-23 | 1 | -41/+133 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | apply: document buffer ownership rules across functions | Junio C Hamano | 2012-04-11 | 1 | -2/+51 |
| * | | | | | | | | apply: tighten constness of line buffer | Junio C Hamano | 2012-04-11 | 1 | -7/+7 |
| * | | | | | | | | apply: drop unused macro | Junio C Hamano | 2012-04-11 | 1 | -1/+0 |
| * | | | | | | | | apply: free unused fragments for submodule patch | Junio C Hamano | 2012-03-28 | 1 | -9/+15 |
| * | | | | | | | | apply: free patch->result | Junio C Hamano | 2012-03-27 | 1 | -0/+1 |
| * | | | | | | | | apply: release memory for fn_table | Junio C Hamano | 2012-03-27 | 1 | -1/+1 |
| * | | | | | | | | apply: free patch->{def,old,new}_name fields | Junio C Hamano | 2012-03-27 | 1 | -26/+39 |
| * | | | | | | | | apply: rename free_patch() to free_patch_list() | Junio C Hamano | 2012-03-27 | 1 | -14/+19 |
| * | | | | | | | | apply: do not leak patches and fragments | Jared Hance | 2012-03-07 | 1 | -4/+23 |
* | | | | | | | | | Merge branch 'rl/show-empty-prefix' | Junio C Hamano | 2012-04-23 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | rev-parse --show-prefix: add in trailing newline | Ross Lagerwall | 2012-04-10 | 1 | -0/+2 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'ms/remote-usage-string' | Junio C Hamano | 2012-04-23 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | remote: update builtin usage | Michael Schubert | 2012-04-09 | 1 | -2/+2 |
| | |_|_|_|/ / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'ct/advise-push-default' | Junio C Hamano | 2012-04-20 | 1 | -5/+55 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | push: Provide situational hints for non-fast-forward errors | Christopher Tiwald | 2012-03-19 | 1 | -5/+55 |
* | | | | | | | | | | Merge branch 'jc/push-upstream-sanity' | Junio C Hamano | 2012-04-20 | 1 | -8/+18 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | push: error out when the "upstream" semantics does not make sense | Junio C Hamano | 2012-04-05 | 1 | -8/+18 |
* | | | | | | | | | | | Merge branch 'jc/fmt-merge-msg-people' | Junio C Hamano | 2012-04-20 | 1 | -4/+110 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | fmt-merge-msg: show those involved in a merged seriesjc/fmt-merge-msg-people | Junio C Hamano | 2012-03-13 | 1 | -4/+110 |
* | | | | | | | | | | | | Merge branch 'jc/commit-unedited-template' | Junio C Hamano | 2012-04-16 | 1 | -19/+43 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | commit: rephrase the error when user did not touch templated log message | Junio C Hamano | 2012-03-30 | 1 | -19/+41 |
| * | | | | | | | | | | | | commit: do not trigger bogus "has templated message edited" check | Junio C Hamano | 2012-03-30 | 1 | -0/+2 |
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'jk/branch-quiet' | Junio C Hamano | 2012-04-16 | 2 | -6/+11 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | teach "git branch" a --quiet optionjk/branch-quiet | Jeff King | 2012-03-26 | 1 | -6/+10 |
| * | | | | | | | | | | | | checkout: suppress tracking message with "-q" | Jeff King | 2012-03-26 | 2 | -1/+2 |