summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/merge-tree-added-identically'Junio C Hamano2013-05-061-1/+5
|\
| * merge-tree: handle directory/empty conflict correctlyJohn Keeping2013-05-061-1/+5
* | Merge branch 'tr/remote-tighten-commandline-parsing'Junio C Hamano2013-05-011-1/+1
|\ \
| * | remote: check for superfluous arguments in 'git remote add'Thomas Rast2013-04-241-1/+1
* | | Merge branch 'jk/check-corrupt-objects-carefully'Junio C Hamano2013-04-281-1/+1
|\ \ \
| * | | clone: Make the 'junk_mode' symbol a file staticRamsay Jones2013-04-281-1/+1
* | | | Merge branch 'jk/merge-tree-added-identically'Junio C Hamano2013-04-281-1/+1
|\ \ \ \ | | |_|/ | |/| |
| * | | merge-tree: fix typo in "both changed identically"John Keeping2013-04-281-1/+1
* | | | Merge branch 'rr/shortlog-doc'Junio C Hamano2013-04-262-4/+2
|\ \ \ \
| * | | | builtin/shortlog.c: make usage string consistent with logRamkumar Ramachandra2013-04-221-3/+1
| * | | | builtin/log.c: make usage string consistent with docRamkumar Ramachandra2013-04-221-1/+1
* | | | | Merge branch 'jc/add-ignore-removal'Junio C Hamano2013-04-261-6/+17
|\ \ \ \ \
| * | | | | git add: rephrase -A/--no-all warningJunio C Hamano2013-04-221-6/+6
| * | | | | git add: --ignore-removal is a better named --no-allJunio C Hamano2013-04-221-0/+11
* | | | | | Merge branch 'jc/warn-pathless-add-finishing-touches'Junio C Hamano2013-04-261-0/+2
|\ \ \ \ \ \
| * | | | | | git add: avoid "-u/-A without pathspec" warning on stat-dirty pathsJunio C Hamano2013-04-261-0/+2
* | | | | | | Merge branch 'jk/remote-helper-with-signed-tags'Junio C Hamano2013-04-241-1/+7
|\ \ \ \ \ \ \
| * | | | | | | fast-export: add --signed-tags=warn-strip modeJohn Keeping2013-04-151-1/+7
* | | | | | | | Sync with maintJunio C Hamano2013-04-241-2/+2
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jc/merge-tag-object' into maintJunio C Hamano2013-04-241-0/+13
| |\ \ \ \ \ \ \ \
| * | | | | | | | | cherry-pick/revert: make usage say '<commit-ish>...'Kevin Bracey2013-04-241-2/+2
| | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Merge branch 'jk/show-branch-strbuf' into maintJunio C Hamano2013-04-221-9/+8
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jc/apply-ws-fix-tab-in-indent' into maintJunio C Hamano2013-04-221-6/+10
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'nd/pretty-formats'Junio C Hamano2013-04-232-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | pretty: save commit encoding from logmsg_reencode if the caller needs itNguyễn Thái Ngọc Duy2013-04-182-2/+2
* | | | | | | | | | | Merge branch 'kb/status-ignored-optim-2'Junio C Hamano2013-04-233-21/+6
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | dir.c: git-status --ignored: don't scan the work tree twiceKarsten Blees2013-04-151-1/+0
| * | | | | | | | | | | dir.c: replace is_path_excluded with now equivalent is_excluded APIKarsten Blees2013-04-153-20/+6
| | |_|_|_|_|/ / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jk/receive-pack-deadlocks-with-early-failure'Junio C Hamano2013-04-231-1/+4
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | |
| * | | | | | | | | | receive-pack: close sideband fd on early pack errorsJeff King2013-04-191-1/+4
* | | | | | | | | | | Merge branch 'as/clone-reference-with-gitfile'Junio C Hamano2013-04-221-3/+13
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | clone: Allow repo using gitfile as a referenceAaron Schrab2013-04-091-2/+12
| * | | | | | | | | | | clone: Fix error message for reference repositoryAaron Schrab2013-04-081-1/+1
* | | | | | | | | | | | Merge branch 'jc/add-2.0-delete-default' (early part)Junio C Hamano2013-04-221-28/+87
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | git add: rephrase the "removal will cease to be ignored" warningJunio C Hamano2013-04-211-7/+14
| * | | | | | | | | | | | git add: rework the logic to warn "git add <pathspec>..." default changeJunio C Hamano2013-04-171-26/+38
| * | | | | | | | | | | | git add: start preparing for "git add <pathspec>..." to default to "-A"Junio C Hamano2013-03-081-2/+43
| * | | | | | | | | | | | builtin/add.c: simplify boolean variablesJunio C Hamano2013-03-081-11/+11
* | | | | | | | | | | | | Merge branch 'nd/checkout-keep-sparse'Junio C Hamano2013-04-221-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | checkout: add --ignore-skip-worktree-bits in sparse checkout modeNguyễn Thái Ngọc Duy2013-04-151-0/+5
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'jk/chopped-ident'Junio C Hamano2013-04-222-74/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | blame: handle broken commit headers gracefullyRené Scharfe2013-04-171-3/+8
| * | | | | | | | | | | | cat-file: print tags raw for "cat-file -p"Jeff King2013-04-171-71/+0
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'jn/add-2.0-u-A-sans-pathspec' (early part)Junio C Hamano2013-04-191-40/+94
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | add -A: only show pathless 'add -A' warning when changes exist outside cwdJonathan Nieder2013-04-031-5/+16
| * | | | | | | | | | | | add -u: only show pathless 'add -u' warning when changes exist outside cwdJonathan Nieder2013-04-031-4/+37
| * | | | | | | | | | | | add: make warn_pathless_add() a no-op after first callJonathan Nieder2013-04-031-0/+5
| * | | | | | | | | | | | add: add a blank line at the end of pathless 'add [-u|-A]' warningMatthieu Moy2013-04-031-1/+3
| * | | | | | | | | | | | add: make pathless 'add [-u|-A]' warning a file-global functionJonathan Nieder2013-03-201-33/+36
* | | | | | | | | | | | | Merge branch 'ap/strbuf-humanize'Junio C Hamano2013-04-191-8/+36
|\ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status