Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'maint' | Junio C Hamano | 2010-05-25 | 1 | -1/+2 |
|\ | |||||
| * | show-branch: use DEFAULT_ABBREV instead of 7 | Tay Ray Chuan | 2010-05-25 | 1 | -1/+2 |
* | | Merge branch 'pb/patch-id-plus' | Junio C Hamano | 2010-05-21 | 1 | -19/+88 |
|\ \ | |||||
| * | | patch-id: Add support for mbox format | Paolo Bonzini | 2010-04-19 | 1 | -6/+62 |
| * | | patch-id: extract parsing one diff out of generate_id_list | Paolo Bonzini | 2010-04-19 | 1 | -13/+26 |
* | | | Merge branch 'st/remote-tags-no-tags' | Junio C Hamano | 2010-05-21 | 1 | -1/+20 |
|\ \ \ | |||||
| * | | | remote add: add a --[no-]tags option | Samuel Tardieu | 2010-04-19 | 1 | -1/+20 |
| |/ / | |||||
* | | | Merge branch 'jn/shortlog' | Junio C Hamano | 2010-05-21 | 1 | -1/+2 |
* | | | Merge branch 'js/maint-receive-pack-symref-alias' | Junio C Hamano | 2010-05-21 | 1 | -37/+91 |
* | | | Merge branch 'np/index-pack-memsave' | Junio C Hamano | 2010-05-21 | 1 | -44/+45 |
* | | | Merge branch 'jc/maint-no-reflog-expire-unreach-for-head' | Junio C Hamano | 2010-05-21 | 1 | -10/+59 |
* | | | Merge branch 'sp/maint-describe-tiebreak-with-tagger-date' | Junio C Hamano | 2010-05-21 | 1 | -4/+45 |
* | | | Merge branch 'jc/status-show-ignored' | Junio C Hamano | 2010-05-21 | 1 | -1/+5 |
|\ \ \ | |||||
| * | | | status: --ignored option shows ignored files | Junio C Hamano | 2010-04-10 | 1 | -1/+5 |
* | | | | Merge branch 'np/malloc-threading' | Junio C Hamano | 2010-05-21 | 2 | -3/+12 |
* | | | | Merge branch 'sr/remote-helper-export' | Junio C Hamano | 2010-05-21 | 1 | -8/+8 |
|\ \ \ \ | |||||
| * | | | | clone: also configure url for bare clones | Sverre Rabbelier | 2010-03-31 | 1 | -4/+4 |
| * | | | | clone: pass the remote name to remote_get | Sverre Rabbelier | 2010-03-31 | 1 | -4/+4 |
* | | | | | Merge branch 'ar/config-from-command-line' | Junio C Hamano | 2010-05-21 | 1 | -1/+5 |
|\ \ \ \ \ | |||||
| * | | | | | Allow passing of configuration parameters in the command line | Alex Riesen | 2010-03-28 | 1 | -1/+5 |
* | | | | | | Merge branch 'em/checkout-orphan' | Junio C Hamano | 2010-05-21 | 1 | -2/+13 |
|\ \ \ \ \ \ | |||||
| * | | | | | | git checkout: create unparented branch by --orphan | Erick Mattos | 2010-03-21 | 1 | -2/+13 |
| |/ / / / / | |||||
* | | | | | | for-each-ref: Field with abbreviated objectname | Michael J Gruber | 2010-05-18 | 1 | -0/+3 |
* | | | | | | Merge branch 'maint' | Junio C Hamano | 2010-05-10 | 1 | -1/+1 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | handle "git --bare init <dir>" properly | Jeff King | 2010-05-10 | 1 | -1/+1 |
* | | | | | | Merge branch 'bg/apply-blank-trailing-context' | Junio C Hamano | 2010-05-08 | 1 | -6/+6 |
* | | | | | | Merge branch 'rc/ls-remote-default' | Junio C Hamano | 2010-05-08 | 1 | -4/+7 |
|\ \ \ \ \ \ | |||||
| * | | | | | | ls-remote: fall-back to default remotes when no remote specified | Tay Ray Chuan | 2010-04-08 | 1 | -4/+7 |
* | | | | | | | Merge branch 'ab/commit-empty-message' | Junio C Hamano | 2010-05-08 | 1 | -3/+9 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Add option to git-commit to allow empty log messages | Ævar Arnfjörð Bjarmason | 2010-04-07 | 1 | -3/+9 |
* | | | | | | | | Merge branch 'jc/maint-reflog-expire-unreachable' | Junio C Hamano | 2010-05-08 | 1 | -40/+56 |
* | | | | | | | | Merge branch 'sd/log-decorate' | Junio C Hamano | 2010-05-08 | 1 | -6/+40 |
* | | | | | | | | Merge branch 'mh/status-optionally-refresh' | Junio C Hamano | 2010-05-08 | 1 | -0/+9 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | git status: refresh the index if possible | Markus Heidelberg | 2010-04-02 | 1 | -0/+9 |
* | | | | | | | | | Merge branch 'cw/ws-indent-with-tab' | Junio C Hamano | 2010-05-08 | 1 | -42/+39 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | whitespace: replumb ws_fix_copy to take a strbuf *dst instead of char *dst | Chris Webb | 2010-04-04 | 1 | -42/+39 |
| | |_|_|_|_|/ / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'cc/revert-strategy' | Junio C Hamano | 2010-05-08 | 2 | -110/+150 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | revert: add "--strategy" option to choose merge strategy | Christian Couder | 2010-04-01 | 1 | -2/+23 |
| * | | | | | | | | | merge: make function try_merge_command non static | Christian Couder | 2010-04-01 | 1 | -2/+2 |
| * | | | | | | | | | merge: refactor code that calls "git merge-STRATEGY" | Christian Couder | 2010-04-01 | 1 | -36/+45 |
| * | | | | | | | | | revert: refactor merge recursive code into its own function | Christian Couder | 2010-04-01 | 1 | -48/+58 |
| * | | | | | | | | | revert: use strbuf to refactor the code that writes the merge message | Christian Couder | 2010-04-01 | 1 | -36/+34 |
* | | | | | | | | | | Merge branch 'jk/cached-textconv' | Junio C Hamano | 2010-05-08 | 1 | -69/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | make commit_tree a library function | Jeff King | 2010-04-01 | 1 | -69/+1 |
* | | | | | | | | | | | Merge branch 'pc/remove-warn' | Junio C Hamano | 2010-05-08 | 1 | -5/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Introduce remove_or_warn function | Peter Collingbourne | 2010-03-28 | 1 | -5/+1 |
* | | | | | | | | | | | cherry-pick: do not dump core when iconv fails | Jonathan Nieder | 2010-05-08 | 1 | -2/+7 |
* | | | | | | | | | | | clone: quell the progress report from init and report on clone | Junio C Hamano | 2010-05-04 | 1 | -1/+5 |
* | | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2010-05-01 | 1 | -1/+1 |
* | | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2010-04-19 | 1 | -1/+1 |
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |