summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ph/builtin-srcs-are-in-subdir-these-days' into maintJunio C Hamano2013-07-213-4/+2
|\
| * fix "builtin-*" references to be "builtin/*"Phil Hord2013-06-183-4/+2
* | apply.c::find_name_traditional(): do not initialize len to the line's lengthStefan Beller2013-07-191-1/+1
* | Merge branch 'rs/logical-vs-binary-or' into maintJunio C Hamano2013-07-193-6/+6
|\ \
| * | use logical OR (||) instead of binary OR (|) in logical contextRené Scharfe2013-06-133-6/+6
* | | Merge branch 'tr/maint-apply-non-git-patch-parsefix' into maintJunio C Hamano2013-07-151-1/+1
|\ \ \
| * | | apply: carefully strdup a possibly-NULL nameThomas Rast2013-06-211-1/+1
* | | | Merge branch 'vv/help-unknown-ref' into maintJunio C Hamano2013-07-031-1/+2
|\ \ \ \
| * | | | merge: use help_unknown_ref()Vikrant Varma2013-05-081-1/+2
* | | | | Merge branch 'nd/clone-connectivity-shortcut' (early part) into maintJunio C Hamano2013-06-281-0/+4
|\ \ \ \ \
| * | | | | clone: let the user know when check_everything_connected is runNguyễn Thái Ngọc Duy2013-05-111-0/+4
| |/ / / /
* | | | | Merge branch 'rr/push-head' into maintJunio C Hamano2013-06-271-7/+14
|\ \ \ \ \
| * | | | | push: make push.default = current use resolved HEADRamkumar Ramachandra2013-05-291-1/+1
| * | | | | push: fail early with detached HEAD and currentRamkumar Ramachandra2013-05-291-0/+5
| * | | | | push: factor out the detached HEAD error messageRamkumar Ramachandra2013-05-291-6/+8
| |/ / / /
* | | | | Merge branch 'rs/commit-m-no-edit' into maintJunio C Hamano2013-06-271-4/+6
|\ \ \ \ \
| * | | | | commit: don't start editor if empty message is given with -mRené Scharfe2013-05-281-4/+6
| * | | | | Merge branch 'tr/remote-tighten-commandline-parsing' into maintJunio C Hamano2013-05-031-1/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jk/receive-pack-deadlocks-with-early-failure' into maintJunio C Hamano2013-04-261-1/+4
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jk/chopped-ident' into maintJunio C Hamano2013-04-262-74/+8
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'rt/commentchar-fmt-merge-msg' into maintJunio C Hamano2013-04-261-7/+11
| |\ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ Merge branch 'jh/checkout-auto-tracking' into maintJunio C Hamano2013-06-271-20/+22
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
| * | | | | | | | | checkout: Use remote refspecs when DWIMming tracking branchesJohan Herland2013-04-211-20/+22
* | | | | | | | | | Merge branch 'jn/config-ignore-inaccessible' into maintJunio C Hamano2013-06-091-2/+2
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | |
| * | | | | | | | | config: allow inaccessible configuration under $HOMEJonathan Nieder2013-04-151-2/+2
* | | | | | | | | | 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
View Lorry Controller Status