summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/commit-date-approxidate'Junio C Hamano2014-06-031-19/+60
|\
| * commit: accept more date formats for "--date"Jeff King2014-05-021-2/+25
| * commit: print "Date" line when the user has set dateJeff King2014-05-021-0/+19
| * commit: use split_ident_line to compare author/committerJeff King2014-05-021-17/+16
* | Merge branch 'fc/rerere-conflict-style'Junio C Hamano2014-06-031-0/+2
|\ \
| * | rerere: fix for merge.conflictstylefc/rerere-conflict-styleFelipe Contreras2014-04-301-0/+2
* | | Merge branch 'sk/tag-contains-wo-recursion'Junio C Hamano2014-06-031-15/+75
|\ \ \
| * | | git tag --contains: avoid stack overflowJean-Jacques Lafay2014-04-251-15/+75
| | |/ | |/|
* | | Merge branch 'jx/blame-align-relative-time'Junio C Hamano2014-06-031-8/+22
|\ \ \
| * | | blame: dynamic blame_date_width for different localesjx/blame-align-relative-timeJiang Xin2014-04-231-1/+8
| * | | blame: fix broken time_buf paddings in relative timestampJiang Xin2014-04-231-7/+14
* | | | Merge branch 'fc/merge-default-to-upstream'Junio C Hamano2014-06-031-1/+1
|\ \ \ \
| * | | | merge: enable defaulttoupstream by defaultfc/merge-default-to-upstreamFelipe Contreras2014-04-221-1/+1
| | |/ / | |/| |
* | | | Merge branch 'rs/ref-update-check-errors-early'Junio C Hamano2014-06-031-4/+4
|\ \ \ \
| * | | | commit.c: check for lock error and return earlyrs/ref-update-check-errors-earlyRonnie Sahlberg2014-04-171-4/+4
| | |/ / | |/| |
* | | | Merge branch 'nd/index-pack-one-fd-per-thread'Junio C Hamano2014-06-031-10/+17
|\ \ \ \
| * | | | index-pack: work around thread-unsafe pread()nd/index-pack-one-fd-per-threadNguyễn Thái Ngọc Duy2014-04-161-10/+17
* | | | | Merge branch 'ym/fix-opportunistic-index-update-race'Junio C Hamano2014-06-031-1/+1
|\ \ \ \ \
| * | | | | wrapper.c: add xpread() similar to xread()Yiannis Marangos2014-04-101-1/+1
| | |_|_|/ | |/| | |
* | | | | Merge branch 'mh/ref-transaction'Junio C Hamano2014-06-036-178/+277
|\ \ \ \ \
| * | | | | update-ref --stdin: reimplement using reference transactionsMichael Haggerty2014-04-071-67/+75
| * | | | | update-ref --stdin: harmonize error messagesMichael Haggerty2014-04-071-12/+12
| * | | | | update-ref --stdin: improve the error message for unexpected EOFMichael Haggerty2014-04-071-2/+2
| * | | | | update-ref --stdin -z: deprecate interpreting the empty string as zerosMichael Haggerty2014-04-071-0/+2
| * | | | | update-ref.c: extract a new function, parse_next_sha1()Michael Haggerty2014-04-071-62/+98
| * | | | | update-ref --stdin: simplify error messages for missing oldvaluesMichael Haggerty2014-04-071-3/+3
| * | | | | update-ref --stdin: make error messages more consistentMichael Haggerty2014-04-071-4/+4
| * | | | | update-ref --stdin: improve error messages for invalid valuesMichael Haggerty2014-04-071-11/+13
| * | | | | update-ref.c: extract a new function, parse_refname()Michael Haggerty2014-04-071-49/+41
| * | | | | parse_cmd_verify(): copy old_sha1 instead of evaluating <oldvalue> twiceMichael Haggerty2014-04-071-1/+1
| * | | | | update-ref --stdin: read the whole input at onceMichael Haggerty2014-04-071-62/+108
| * | | | | update_refs(): fix constnessMichael Haggerty2014-04-071-1/+1
| * | | | | refs.h: rename the action_on_err constantsMichael Haggerty2014-04-076-15/+19
| * | | | | parse_arg(): really test that argument is properly terminatedMichael Haggerty2014-04-071-5/+15
* | | | | | Merge branch 'jc/apply-ignore-whitespace'Junio C Hamano2014-06-031-5/+7
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | apply --ignore-space-change: lines with and without leading whitespaces do no...jc/apply-ignore-whitespaceJunio C Hamano2014-03-261-5/+7
| | |/ / / | |/| | |
* | | | | i18n: only extract comments marked with "TRANSLATORS:"Jiang Xin2014-04-171-5/+3
| |_|_|/ |/| | |
* | | | Merge branch 'jk/pack-bitmap'Junio C Hamano2014-04-081-1/+12
|\ \ \ \
| * | | | pack-objects: do not reuse packfiles without --delta-base-offsetJeff King2014-04-041-1/+12
* | | | | Merge branch 'jl/nor-or-nand-and'Junio C Hamano2014-04-086-8/+8
|\ \ \ \ \
| * | | | | code and test: fix misuses of "nor"jl/nor-or-nand-andJustin Lebar2014-03-312-4/+4
| * | | | | comments: fix misuses of "nor"Justin Lebar2014-03-314-4/+4
| * | | | | Merge branch 'jk/clean-d-pathspec' into maintJunio C Hamano2014-03-181-11/+9
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'nd/reset-setup-worktree' into maintJunio C Hamano2014-03-181-3/+4
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jc/check-attr-honor-working-tree' into maintJunio C Hamano2014-03-181-0/+3
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'ds/rev-parse-required-args' into maintJunio C Hamano2014-03-181-6/+11
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'nd/submodule-pathspec-ending-with-slash' into maintJunio C Hamano2014-03-189-36/+18
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge branch 'mh/update-ref-batch-create-fix'Junio C Hamano2014-04-081-0/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | update-ref: fail create operation over stdin if ref already existsmh/update-ref-batch-create-fixAman Gupta2014-04-021-0/+1
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'jc/rev-parse-argh-dashed-multi-words'Junio C Hamano2014-04-087-9/+37
|\ \ \ \ \ \ \ \ \ \
View Lorry Controller Status