Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'jk/merge-tree-added-identically' | Junio C Hamano | 2013-05-06 |
|\ | |||
| * | merge-tree: handle directory/empty conflict correctly | John Keeping | 2013-05-06 |
* | | Merge branch 'tr/remote-tighten-commandline-parsing' | Junio C Hamano | 2013-05-01 |
|\ \ | |||
| * | | remote: check for superfluous arguments in 'git remote add' | Thomas Rast | 2013-04-24 |
* | | | Merge branch 'jk/check-corrupt-objects-carefully' | Junio C Hamano | 2013-04-28 |
|\ \ \ | |||
| * | | | clone: Make the 'junk_mode' symbol a file static | Ramsay Jones | 2013-04-28 |
* | | | | Merge branch 'jk/merge-tree-added-identically' | Junio C Hamano | 2013-04-28 |
|\ \ \ \ | | |_|/ | |/| | | |||
| * | | | merge-tree: fix typo in "both changed identically" | John Keeping | 2013-04-28 |
* | | | | Merge branch 'rr/shortlog-doc' | Junio C Hamano | 2013-04-26 |
|\ \ \ \ | |||
| * | | | | builtin/shortlog.c: make usage string consistent with log | Ramkumar Ramachandra | 2013-04-22 |
| * | | | | builtin/log.c: make usage string consistent with doc | Ramkumar Ramachandra | 2013-04-22 |
* | | | | | Merge branch 'jc/add-ignore-removal' | Junio C Hamano | 2013-04-26 |
|\ \ \ \ \ | |||
| * | | | | | git add: rephrase -A/--no-all warning | Junio C Hamano | 2013-04-22 |
| * | | | | | git add: --ignore-removal is a better named --no-all | Junio C Hamano | 2013-04-22 |
* | | | | | | Merge branch 'jc/warn-pathless-add-finishing-touches' | Junio C Hamano | 2013-04-26 |
|\ \ \ \ \ \ | |||
| * | | | | | | git add: avoid "-u/-A without pathspec" warning on stat-dirty paths | Junio C Hamano | 2013-04-26 |
* | | | | | | | Merge branch 'jk/remote-helper-with-signed-tags' | Junio C Hamano | 2013-04-24 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | fast-export: add --signed-tags=warn-strip mode | John Keeping | 2013-04-15 |
* | | | | | | | | Sync with maint | Junio C Hamano | 2013-04-24 |
|\ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ | Merge branch 'jc/merge-tag-object' into maint | Junio C Hamano | 2013-04-24 |
| |\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | cherry-pick/revert: make usage say '<commit-ish>...' | Kevin Bracey | 2013-04-24 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||
| * | | | | | | | | Merge branch 'jk/show-branch-strbuf' into maint | Junio C Hamano | 2013-04-22 |
| |\ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ | Merge branch 'jc/apply-ws-fix-tab-in-indent' into maint | Junio C Hamano | 2013-04-22 |
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | | | |||
* | | | | | | | | | | Merge branch 'nd/pretty-formats' | Junio C Hamano | 2013-04-23 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | pretty: save commit encoding from logmsg_reencode if the caller needs it | Nguyễn Thái Ngọc Duy | 2013-04-18 |
* | | | | | | | | | | | Merge branch 'kb/status-ignored-optim-2' | Junio C Hamano | 2013-04-23 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | dir.c: git-status --ignored: don't scan the work tree twice | Karsten Blees | 2013-04-15 |
| * | | | | | | | | | | | dir.c: replace is_path_excluded with now equivalent is_excluded API | Karsten Blees | 2013-04-15 |
| | |_|_|_|_|/ / / / / | |/| | | | | | | | | | |||
* | | | | | | | | | | | Merge branch 'jk/receive-pack-deadlocks-with-early-failure' | Junio C Hamano | 2013-04-23 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | |||
| * | | | | | | | | | | receive-pack: close sideband fd on early pack errors | Jeff King | 2013-04-19 |
* | | | | | | | | | | | Merge branch 'as/clone-reference-with-gitfile' | Junio C Hamano | 2013-04-22 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | clone: Allow repo using gitfile as a reference | Aaron Schrab | 2013-04-09 |
| * | | | | | | | | | | | clone: Fix error message for reference repository | Aaron Schrab | 2013-04-08 |
* | | | | | | | | | | | | Merge branch 'jc/add-2.0-delete-default' (early part) | Junio C Hamano | 2013-04-22 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | git add: rephrase the "removal will cease to be ignored" warning | Junio C Hamano | 2013-04-21 |
| * | | | | | | | | | | | | git add: rework the logic to warn "git add <pathspec>..." default change | Junio C Hamano | 2013-04-17 |
| * | | | | | | | | | | | | git add: start preparing for "git add <pathspec>..." to default to "-A" | Junio C Hamano | 2013-03-08 |
| * | | | | | | | | | | | | builtin/add.c: simplify boolean variables | Junio C Hamano | 2013-03-08 |
* | | | | | | | | | | | | | Merge branch 'nd/checkout-keep-sparse' | Junio C Hamano | 2013-04-22 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | checkout: add --ignore-skip-worktree-bits in sparse checkout mode | Nguyễn Thái Ngọc Duy | 2013-04-15 |
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | | |||
* | | | | | | | | | | | | | Merge branch 'jk/chopped-ident' | Junio C Hamano | 2013-04-22 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | |||
| * | | | | | | | | | | | | blame: handle broken commit headers gracefully | René Scharfe | 2013-04-17 |
| * | | | | | | | | | | | | cat-file: print tags raw for "cat-file -p" | Jeff King | 2013-04-17 |
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | | |||
* | | | | | | | | | | | | Merge branch 'jn/add-2.0-u-A-sans-pathspec' (early part) | Junio C Hamano | 2013-04-19 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | add -A: only show pathless 'add -A' warning when changes exist outside cwd | Jonathan Nieder | 2013-04-03 |
| * | | | | | | | | | | | | add -u: only show pathless 'add -u' warning when changes exist outside cwd | Jonathan Nieder | 2013-04-03 |
| * | | | | | | | | | | | | add: make warn_pathless_add() a no-op after first call | Jonathan Nieder | 2013-04-03 |
| * | | | | | | | | | | | | add: add a blank line at the end of pathless 'add [-u|-A]' warning | Matthieu Moy | 2013-04-03 |
| * | | | | | | | | | | | | add: make pathless 'add [-u|-A]' warning a file-global function | Jonathan Nieder | 2013-03-20 |
* | | | | | | | | | | | | | Merge branch 'ap/strbuf-humanize' | Junio C Hamano | 2013-04-19 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ |