Commit message (Expand) | Author | Age | ||
---|---|---|---|---|
... | ||||
| * | | | | | | | fmt-merge-msg: remove custom string_list implementation | Stephen Boyd | 2010-03-24 | |
| * | | | | | | | fmt-merge-msg: use pretty.c routines | Stephen Boyd | 2010-03-24 | |
| * | | | | | | | fmt-merge-msg: be quiet if nothing to merge | Stephen Boyd | 2010-03-24 | |
| | |/ / / / / | |/| | | | | | ||||
* | | | | | | | Merge branch 'ef/maint-empty-commit-log' | Junio C Hamano | 2010-04-06 | |
* | | | | | | | Merge branch 'mg/use-default-abbrev-length-in-rev-list' | Junio C Hamano | 2010-04-03 | |
* | | | | | | | Merge branch 'jn/merge-diff3-label' | Junio C Hamano | 2010-04-03 | |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | ||||
| * | | | | | | cherry-pick, revert: add a label for ancestor | Jonathan Nieder | 2010-03-20 | |
| * | | | | | | revert: clarify label on conflict hunks | Jonathan Nieder | 2010-03-20 | |
| * | | | | | | checkout -m --conflict=diff3: add a label for ancestor | Jonathan Nieder | 2010-03-20 | |
| * | | | | | | checkout --conflict=diff3: add a label for ancestor | Jonathan Nieder | 2010-03-20 | |
| * | | | | | | ll_merge(): add ancestor label parameter for diff3-style output | Jonathan Nieder | 2010-03-20 | |
| * | | | | | | merge-file --diff3: add a label for ancestor | Jonathan Nieder | 2010-03-20 | |
| * | | | | | | xdl_merge(): move file1 and file2 labels to xmparam structure | Jonathan Nieder | 2010-03-20 | |
* | | | | | | | Merge branch 'ef/cherry-abbrev' | Junio C Hamano | 2010-04-03 | |
|\ \ \ \ \ \ \ | ||||
| * | | | | | | | ls: remove redundant logic | Erik Faye-Lund | 2010-03-21 | |
| * | | | | | | | cherry: support --abbrev option | Erik Faye-Lund | 2010-03-21 | |
| |/ / / / / / | ||||
* | | | | | | | Merge branch 'rs/threaded-grep-context' | Junio C Hamano | 2010-04-03 | |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | ||||
| * | | | | | | grep: enable threading for context line printing | René Scharfe | 2010-03-15 | |
| | |_|_|_|/ | |/| | | | | ||||
* | | | | | | builtin/commit: remove unnecessary variable definition | Markus Heidelberg | 2010-04-02 | |
* | | | | | | builtin/commit: fix duplicated sentence in a comment | Markus Heidelberg | 2010-04-02 | |
| |_|_|/ / |/| | | | | ||||
* | | | | | Sync with 1.7.0.4 | Junio C Hamano | 2010-03-31 | |
| |_|_|/ |/| | | | ||||
* | | | | Merge branch 'maint' | Junio C Hamano | 2010-03-29 | |
* | | | | Merge branch 'cc/cherry-pick-ff' | Junio C Hamano | 2010-03-28 | |
* | | | | Merge branch 'sb/notes-parse-opt' | Junio C Hamano | 2010-03-28 | |
* | | | | Merge branch 'maint' | Junio C Hamano | 2010-03-28 | |
| |_|/ |/| | | ||||
* | | | Merge branch 'tr/notes-display' | Junio C Hamano | 2010-03-24 | |
* | | | Merge branch 'pb/log-first-parent-p-m' | Junio C Hamano | 2010-03-24 | |
| |/ |/| | ||||
* | | Merge branch 'ml/color-grep' | Junio C Hamano | 2010-03-20 | |
* | | Merge branch 'cc/reset-keep' | Junio C Hamano | 2010-03-20 | |
* | | Merge branch 'bg/apply-fix-blank-at-eof' | Junio C Hamano | 2010-03-20 | |
* | | Merge branch 'bw/union-merge-refactor' | Junio C Hamano | 2010-03-20 | |
* | | Merge branch 'maint' | Junio C Hamano | 2010-03-20 | |
|/ | ||||
* | Merge branch 'sd/format-patch-to' | Junio C Hamano | 2010-03-15 | |
* | Merge branch 'tc/transport-verbosity' | Junio C Hamano | 2010-03-15 | |
* | Merge branch 'ld/push-porcelain' | Junio C Hamano | 2010-03-15 | |
* | Merge branch 'jh/notes' | Junio C Hamano | 2010-03-15 | |
* | Merge branch 'maint' | Junio C Hamano | 2010-03-13 | |
* | Merge branch 'sd/init-template' | Junio C Hamano | 2010-03-10 | |
* | Merge branch 'sh/am-keep-cr' | Junio C Hamano | 2010-03-10 | |
* | Merge branch 'cp/add-u-pathspec' | Junio C Hamano | 2010-03-10 | |
* | Merge branch 'lt/deepen-builtin-source' | Junio C Hamano | 2010-03-10 | |
* | Move 'builtin-*' into a 'builtin/' subdirectory | Linus Torvalds | 2010-02-22 |