Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | cat-file: disable object/refname ambiguity check for batch mode | Jeff King | 2013-07-12 | 1 | -0/+9 |
* | cat-file: split --batch input lines on whitespace | Jeff King | 2013-07-12 | 1 | -1/+19 |
* | cat-file: add %(objectsize:disk) format atom | Jeff King | 2013-07-12 | 1 | -0/+6 |
* | cat-file: add --batch-check=<format> | Jeff King | 2013-07-12 | 1 | -15/+92 |
* | cat-file: refactor --batch option parsing | Jeff King | 2013-07-11 | 1 | -18/+38 |
* | cat-file: teach --batch to stream blob objects | Jeff King | 2013-07-11 | 1 | -13/+28 |
* | Merge branch 'jk/merge-tree-added-identically' | Junio C Hamano | 2013-05-06 | 1 | -1/+5 |
|\ | |||||
| * | merge-tree: handle directory/empty conflict correctly | John Keeping | 2013-05-06 | 1 | -1/+5 |
* | | Merge branch 'tr/remote-tighten-commandline-parsing' | Junio C Hamano | 2013-05-01 | 1 | -1/+1 |
|\ \ | |||||
| * | | remote: check for superfluous arguments in 'git remote add' | Thomas Rast | 2013-04-24 | 1 | -1/+1 |
* | | | Merge branch 'jk/check-corrupt-objects-carefully' | Junio C Hamano | 2013-04-28 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | clone: Make the 'junk_mode' symbol a file static | Ramsay Jones | 2013-04-28 | 1 | -1/+1 |
* | | | | Merge branch 'jk/merge-tree-added-identically' | Junio C Hamano | 2013-04-28 | 1 | -1/+1 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | merge-tree: fix typo in "both changed identically" | John Keeping | 2013-04-28 | 1 | -1/+1 |
* | | | | Merge branch 'rr/shortlog-doc' | Junio C Hamano | 2013-04-26 | 2 | -4/+2 |
|\ \ \ \ | |||||
| * | | | | builtin/shortlog.c: make usage string consistent with log | Ramkumar Ramachandra | 2013-04-22 | 1 | -3/+1 |
| * | | | | builtin/log.c: make usage string consistent with doc | Ramkumar Ramachandra | 2013-04-22 | 1 | -1/+1 |
* | | | | | Merge branch 'jc/add-ignore-removal' | Junio C Hamano | 2013-04-26 | 1 | -6/+17 |
|\ \ \ \ \ | |||||
| * | | | | | git add: rephrase -A/--no-all warning | Junio C Hamano | 2013-04-22 | 1 | -6/+6 |
| * | | | | | git add: --ignore-removal is a better named --no-all | Junio C Hamano | 2013-04-22 | 1 | -0/+11 |
* | | | | | | Merge branch 'jc/warn-pathless-add-finishing-touches' | Junio C Hamano | 2013-04-26 | 1 | -0/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | git add: avoid "-u/-A without pathspec" warning on stat-dirty paths | Junio C Hamano | 2013-04-26 | 1 | -0/+2 |
* | | | | | | | Merge branch 'jk/remote-helper-with-signed-tags' | Junio C Hamano | 2013-04-24 | 1 | -1/+7 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | fast-export: add --signed-tags=warn-strip mode | John Keeping | 2013-04-15 | 1 | -1/+7 |
* | | | | | | | | Sync with maint | Junio C Hamano | 2013-04-24 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'jc/merge-tag-object' into maint | Junio C Hamano | 2013-04-24 | 1 | -0/+13 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | cherry-pick/revert: make usage say '<commit-ish>...' | Kevin Bracey | 2013-04-24 | 1 | -2/+2 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
| * | | | | | | | | Merge branch 'jk/show-branch-strbuf' into maint | Junio C Hamano | 2013-04-22 | 1 | -9/+8 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'jc/apply-ws-fix-tab-in-indent' into maint | Junio C Hamano | 2013-04-22 | 1 | -6/+10 |
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'nd/pretty-formats' | Junio C Hamano | 2013-04-23 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | pretty: save commit encoding from logmsg_reencode if the caller needs it | Nguyễn Thái Ngọc Duy | 2013-04-18 | 2 | -2/+2 |
* | | | | | | | | | | | Merge branch 'kb/status-ignored-optim-2' | Junio C Hamano | 2013-04-23 | 3 | -21/+6 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | dir.c: git-status --ignored: don't scan the work tree twice | Karsten Blees | 2013-04-15 | 1 | -1/+0 |
| * | | | | | | | | | | | dir.c: replace is_path_excluded with now equivalent is_excluded API | Karsten Blees | 2013-04-15 | 3 | -20/+6 |
| | |_|_|_|_|/ / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'jk/receive-pack-deadlocks-with-early-failure' | Junio C Hamano | 2013-04-23 | 1 | -1/+4 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | receive-pack: close sideband fd on early pack errors | Jeff King | 2013-04-19 | 1 | -1/+4 |
* | | | | | | | | | | | Merge branch 'as/clone-reference-with-gitfile' | Junio C Hamano | 2013-04-22 | 1 | -3/+13 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | clone: Allow repo using gitfile as a reference | Aaron Schrab | 2013-04-09 | 1 | -2/+12 |
| * | | | | | | | | | | | clone: Fix error message for reference repository | Aaron Schrab | 2013-04-08 | 1 | -1/+1 |
* | | | | | | | | | | | | Merge branch 'jc/add-2.0-delete-default' (early part) | Junio C Hamano | 2013-04-22 | 1 | -28/+87 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | git add: rephrase the "removal will cease to be ignored" warning | Junio C Hamano | 2013-04-21 | 1 | -7/+14 |
| * | | | | | | | | | | | | git add: rework the logic to warn "git add <pathspec>..." default change | Junio C Hamano | 2013-04-17 | 1 | -26/+38 |
| * | | | | | | | | | | | | git add: start preparing for "git add <pathspec>..." to default to "-A" | Junio C Hamano | 2013-03-08 | 1 | -2/+43 |
| * | | | | | | | | | | | | builtin/add.c: simplify boolean variables | Junio C Hamano | 2013-03-08 | 1 | -11/+11 |
* | | | | | | | | | | | | | Merge branch 'nd/checkout-keep-sparse' | Junio C Hamano | 2013-04-22 | 1 | -0/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | checkout: add --ignore-skip-worktree-bits in sparse checkout mode | Nguyễn Thái Ngọc Duy | 2013-04-15 | 1 | -0/+5 |
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge branch 'jk/chopped-ident' | Junio C Hamano | 2013-04-22 | 2 | -74/+8 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | blame: handle broken commit headers gracefully | René Scharfe | 2013-04-17 | 1 | -3/+8 |
| * | | | | | | | | | | | | cat-file: print tags raw for "cat-file -p" | Jeff King | 2013-04-17 | 1 | -71/+0 |
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'jn/add-2.0-u-A-sans-pathspec' (early part) | Junio C Hamano | 2013-04-19 | 1 | -40/+94 |
|\ \ \ \ \ \ \ \ \ \ \ \ |