Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| * | | | ll_merge(): add ancestor label parameter for diff3-style output | Jonathan Nieder | 2010-03-20 | 1 | -1/+1 |
| * | | | merge-file --diff3: add a label for ancestor | Jonathan Nieder | 2010-03-20 | 1 | -0/+1 |
| * | | | xdl_merge(): move file1 and file2 labels to xmparam structure | Jonathan Nieder | 2010-03-20 | 1 | -2/+3 |
* | | | | Merge branch 'ef/cherry-abbrev' | Junio C Hamano | 2010-04-03 | 3 | -27/+25 |
|\ \ \ \ | |||||
| * | | | | ls: remove redundant logic | Erik Faye-Lund | 2010-03-21 | 2 | -9/+4 |
| * | | | | cherry: support --abbrev option | Erik Faye-Lund | 2010-03-21 | 1 | -18/+21 |
| |/ / / | |||||
* | | | | Merge branch 'rs/threaded-grep-context' | Junio C Hamano | 2010-04-03 | 1 | -2/+13 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | grep: enable threading for context line printing | René Scharfe | 2010-03-15 | 1 | -2/+13 |
* | | | | builtin/commit: remove unnecessary variable definition | Markus Heidelberg | 2010-04-02 | 1 | -1/+1 |
* | | | | builtin/commit: fix duplicated sentence in a comment | Markus Heidelberg | 2010-04-02 | 1 | -2/+2 |
* | | | | Sync with 1.7.0.4 | Junio C Hamano | 2010-03-31 | 1 | -1/+2 |
* | | | | Merge branch 'maint' | Junio C Hamano | 2010-03-29 | 1 | -1/+8 |
* | | | | Merge branch 'cc/cherry-pick-ff' | Junio C Hamano | 2010-03-28 | 2 | -5/+43 |
* | | | | Merge branch 'sb/notes-parse-opt' | Junio C Hamano | 2010-03-28 | 1 | -159/+371 |
* | | | | Merge branch 'maint' | Junio C Hamano | 2010-03-28 | 1 | -1/+1 |
| |_|/ |/| | | |||||
* | | | Merge branch 'tr/notes-display' | Junio C Hamano | 2010-03-24 | 3 | -1/+246 |
* | | | Merge branch 'pb/log-first-parent-p-m' | Junio C Hamano | 2010-03-24 | 2 | -15/+52 |
| |/ |/| | |||||
* | | Merge branch 'ml/color-grep' | Junio C Hamano | 2010-03-20 | 1 | -8/+28 |
* | | Merge branch 'cc/reset-keep' | Junio C Hamano | 2010-03-20 | 1 | -9/+38 |
* | | Merge branch 'bg/apply-fix-blank-at-eof' | Junio C Hamano | 2010-03-20 | 1 | -40/+145 |
* | | Merge branch 'bw/union-merge-refactor' | Junio C Hamano | 2010-03-20 | 1 | -9/+14 |
* | | Merge branch 'maint' | Junio C Hamano | 2010-03-20 | 1 | -6/+5 |
|/ | |||||
* | Merge branch 'sd/format-patch-to' | Junio C Hamano | 2010-03-15 | 1 | -39/+61 |
* | Merge branch 'tc/transport-verbosity' | Junio C Hamano | 2010-03-15 | 3 | -20/+17 |
* | Merge branch 'ld/push-porcelain' | Junio C Hamano | 2010-03-15 | 2 | -3/+7 |
* | Merge branch 'jh/notes' | Junio C Hamano | 2010-03-15 | 1 | -0/+455 |
* | Merge branch 'maint' | Junio C Hamano | 2010-03-13 | 1 | -1/+1 |
* | Merge branch 'sd/init-template' | Junio C Hamano | 2010-03-10 | 1 | -0/+14 |
* | Merge branch 'sh/am-keep-cr' | Junio C Hamano | 2010-03-10 | 1 | -1/+1 |
* | Merge branch 'cp/add-u-pathspec' | Junio C Hamano | 2010-03-10 | 1 | -9/+29 |
* | Merge branch 'lt/deepen-builtin-source' | Junio C Hamano | 2010-03-10 | 19 | -328/+174 |
* | Move 'builtin-*' into a 'builtin/' subdirectory | Linus Torvalds | 2010-02-22 | 89 | -0/+42160 |