summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \ \
| * | | | | count-objects: add -H option to humanize sizesAntoine Pelisse2013-04-101-8/+36
* | | | | | Merge branch 'fc/branch-upstream-color'Junio C Hamano2013-04-191-8/+28
|\ \ \ \ \ \
| * | | | | | branch: colour upstream branchesFelipe Contreras2013-04-151-8/+28
* | | | | | | Merge branch 'jk/merge-tree-added-identically'Junio C Hamano2013-04-181-13/+13
|\ \ \ \ \ \ \
| * | | | | | | merge-tree: don't print entries that match "local"John Keeping2013-04-081-13/+13
* | | | | | | | Merge branch 'fc/send-email-annotate'Junio C Hamano2013-04-181-81/+85
|\ \ \ \ \ \ \ \
| * | | | | | | | format-patch: trivial cleanupsFelipe Contreras2013-04-071-36/+35
| * | | | | | | | format-patch: add format.coverLetter configuration variableFelipe Contreras2013-04-071-6/+26
| * | | | | | | | log: update to OPT_BOOLFelipe Contreras2013-04-071-7/+7
| * | | | | | | | format-patch: refactor branch name calculationFelipe Contreras2013-04-071-17/+16
| * | | | | | | | format-patch: improve head calculation for cover-letterFelipe Contreras2013-04-071-18/+4
* | | | | | | | | Merge branch 'kb/co-orphan-suggestion-short-sha1'Junio C Hamano2013-04-181-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | checkout: abbreviate hash in suggest_reattachKevin Bracey2013-04-081-1/+1
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'rt/commentchar-fmt-merge-msg'Junio C Hamano2013-04-151-7/+11
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fmt-merge-msg: use core.commentchar in tag signatures completelyRalf Thielow2013-04-071-4/+8
| * | | | | | | | | fmt-merge-msg: respect core.commentchar in people creditsRalf Thielow2013-04-071-3/+3
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jk/show-branch-strbuf'Junio C Hamano2013-04-151-9/+8
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | show-branch: use strbuf instead of static bufferJeff King2013-04-061-9/+8
* | | | | | | | | Merge branch 'po/help-guides'Junio C Hamano2013-04-141-7/+7
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | help: mark common_guides[] as translatableSimon Ruderich2013-04-121-7/+7
* | | | | | | | | Sync with 'maint'Junio C Hamano2013-04-122-5/+5
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | Correct common spelling mistakes in comments and testsStefano Lattarini2013-04-121-3/+3
| * | | | | | | | Merge branch 'maint-1.8.1' into maintJunio C Hamano2013-04-121-2/+2
| |\ \ \ \ \ \ \ \
| | * | | | | | | | fast-export: fix argument name in error messagesPaul Price2013-04-121-2/+2
| * | | | | | | | | Merge branch 'nd/index-pack-threaded-fixes' into maintJunio C Hamano2013-04-041-8/+26
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jk/index-pack-correct-depth-fix' into maintJunio C Hamano2013-04-041-0/+2
| |\ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ Merge branch 'po/help-guides'Junio C Hamano2013-04-111-2/+44
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / | |/| | | | | | / / / / | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | |
| * | | | | | | | | | builtin/help.c: add list_common_guides_help() functionPhilip Oakley2013-04-021-3/+33
| * | | | | | | | | | builtin/help.c: add --guide optionPhilip Oakley2013-04-021-2/+8
| * | | | | | | | | | builtin/help.c: split "-a" processing into twoPhilip Oakley2013-04-021-1/+7
* | | | | | | | | | | Merge branch 'jk/rm-removed-paths'Junio C Hamano2013-04-071-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | rm: do not complain about d/f conflicts during deletionJeff King2013-04-041-1/+1
| | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge branch 'mg/gpg-interface-using-status' into maintJunio C Hamano2013-04-032-2/+2
| |\ \ \ \ \ \ \ \ \ \
View Lorry Controller Status