Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
* | | | | | | | | | Merge branch 'jg/auto-initialize-notes-with-percent-n-in-format' | Junio C Hamano | 2010-04-18 | 1 | -1/+5 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | pretty: Initialize notes if %N is used | Johannes Gilger | 2010-04-13 | 1 | -1/+5 |
* | | | | | | | | | | tag -v: use RUN_GIT_CMD to run verify-tag | Jonathan Nieder | 2010-04-17 | 1 | -2/+2 |
|/ / / / / / / / / | |||||
* | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2010-04-09 | 3 | -9/+6 |
| |_|_|_|_|_|/ / |/| | | | | | | | |||||
* | | | | | | | | Merge branch 'jn/mailinfo-scissors' | Junio C Hamano | 2010-04-07 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | |||||
| * | | | | | | | Teach mailinfo %< as an alternative scissors mark | Jonathan Nieder | 2010-04-04 | 1 | -1/+2 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Merge branch 'sb/fmt-merge-msg' | Junio C Hamano | 2010-04-06 | 1 | -103/+56 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | fmt-merge-msg: hide summary option | Stephen Boyd | 2010-03-24 | 1 | -1/+3 |
| * | | | | | | | fmt-merge-msg: remove custom string_list implementation | Stephen Boyd | 2010-03-24 | 1 | -83/+44 |
| * | | | | | | | fmt-merge-msg: use pretty.c routines | Stephen Boyd | 2010-03-24 | 1 | -21/+8 |
| * | | | | | | | fmt-merge-msg: be quiet if nothing to merge | Stephen Boyd | 2010-03-24 | 1 | -0/+3 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'ef/maint-empty-commit-log' | Junio C Hamano | 2010-04-06 | 1 | -1/+4 |
* | | | | | | | Merge branch 'mg/use-default-abbrev-length-in-rev-list' | Junio C Hamano | 2010-04-03 | 1 | -1/+1 |
* | | | | | | | Merge branch 'jn/merge-diff3-label' | Junio C Hamano | 2010-04-03 | 3 | -42/+70 |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||||
| * | | | | | | cherry-pick, revert: add a label for ancestor | Jonathan Nieder | 2010-03-20 | 1 | -1/+4 |
| * | | | | | | revert: clarify label on conflict hunks | Jonathan Nieder | 2010-03-20 | 1 | -39/+62 |
| * | | | | | | checkout -m --conflict=diff3: add a label for ancestor | Jonathan Nieder | 2010-03-20 | 1 | -0/+1 |
| * | | | | | | checkout --conflict=diff3: add a label for ancestor | Jonathan Nieder | 2010-03-20 | 1 | -1/+1 |