summaryrefslogtreecommitdiff
path: root/builtin
AgeCommit message (Expand)AuthorFilesLines
2014-06-03Merge branch 'fc/rerere-conflict-style'Libravatar Junio C Hamano1-0/+2
2014-06-03Merge branch 'sk/tag-contains-wo-recursion'Libravatar Junio C Hamano1-15/+75
2014-06-03Merge branch 'jx/blame-align-relative-time'Libravatar Junio C Hamano1-8/+22
2014-06-03Merge branch 'fc/merge-default-to-upstream'Libravatar Junio C Hamano1-1/+1
2014-06-03Merge branch 'rs/ref-update-check-errors-early'Libravatar Junio C Hamano1-4/+4
2014-06-03Merge branch 'nd/index-pack-one-fd-per-thread'Libravatar Junio C Hamano1-10/+17
2014-06-03Merge branch 'ym/fix-opportunistic-index-update-race'Libravatar Junio C Hamano1-1/+1
2014-06-03Merge branch 'mh/ref-transaction'Libravatar Junio C Hamano6-178/+277
2014-06-03Merge branch 'jc/apply-ignore-whitespace'Libravatar Junio C Hamano1-5/+7
2014-04-30rerere: fix for merge.conflictstyleLibravatar Felipe Contreras1-0/+2
2014-04-25git tag --contains: avoid stack overflowLibravatar Jean-Jacques Lafay1-15/+75
2014-04-23blame: dynamic blame_date_width for different localesLibravatar Jiang Xin1-1/+8
2014-04-23blame: fix broken time_buf paddings in relative timestampLibravatar Jiang Xin1-7/+14
2014-04-22merge: enable defaulttoupstream by defaultLibravatar Felipe Contreras1-1/+1
2014-04-17commit.c: check for lock error and return earlyLibravatar Ronnie Sahlberg1-4/+4
2014-04-17i18n: only extract comments marked with "TRANSLATORS:"Libravatar Jiang Xin1-5/+3
2014-04-16index-pack: work around thread-unsafe pread()Libravatar Nguyễn Thái Ngọc Duy1-10/+17
2014-04-10wrapper.c: add xpread() similar to xread()Libravatar Yiannis Marangos1-1/+1
2014-04-08Merge branch 'jk/pack-bitmap'Libravatar Junio C Hamano1-1/+12
2014-04-08Merge branch 'jl/nor-or-nand-and'Libravatar Junio C Hamano6-8/+8
2014-04-08Merge branch 'mh/update-ref-batch-create-fix'Libravatar Junio C Hamano1-0/+1
2014-04-08Merge branch 'jc/rev-parse-argh-dashed-multi-words'Libravatar Junio C Hamano7-9/+37
2014-04-07update-ref --stdin: reimplement using reference transactionsLibravatar Michael Haggerty1-67/+75
2014-04-07update-ref --stdin: harmonize error messagesLibravatar Michael Haggerty1-12/+12
2014-04-07update-ref --stdin: improve the error message for unexpected EOFLibravatar Michael Haggerty1-2/+2
2014-04-07update-ref --stdin -z: deprecate interpreting the empty string as zerosLibravatar Michael Haggerty1-0/+2
2014-04-07update-ref.c: extract a new function, parse_next_sha1()Libravatar Michael Haggerty1-62/+98
2014-04-07update-ref --stdin: simplify error messages for missing oldvaluesLibravatar Michael Haggerty1-3/+3
2014-04-07update-ref --stdin: make error messages more consistentLibravatar Michael Haggerty1-4/+4
2014-04-07update-ref --stdin: improve error messages for invalid valuesLibravatar Michael Haggerty1-11/+13
2014-04-07update-ref.c: extract a new function, parse_refname()Libravatar Michael Haggerty1-49/+41
2014-04-07parse_cmd_verify(): copy old_sha1 instead of evaluating <oldvalue> twiceLibravatar Michael Haggerty1-1/+1
2014-04-07update-ref --stdin: read the whole input at onceLibravatar Michael Haggerty1-62/+108
2014-04-07update_refs(): fix constnessLibravatar Michael Haggerty1-1/+1
2014-04-07refs.h: rename the action_on_err constantsLibravatar Michael Haggerty6-15/+19
2014-04-07parse_arg(): really test that argument is properly terminatedLibravatar Michael Haggerty1-5/+15
2014-04-04pack-objects: do not reuse packfiles without --delta-base-offsetLibravatar Jeff King1-1/+12
2014-04-03Merge branch 'nd/gc-aggressive'Libravatar Junio C Hamano1-1/+7
2014-04-03Merge branch 'nd/log-show-linear-break'Libravatar Junio C Hamano1-1/+1
2014-04-02update-ref: fail create operation over stdin if ref already existsLibravatar Aman Gupta1-0/+1
2014-03-31Merge branch 'ib/rev-parse-parseopt-argh'Libravatar Junio C Hamano1-1/+12
2014-03-31code and test: fix misuses of "nor"Libravatar Justin Lebar2-4/+4
2014-03-31comments: fix misuses of "nor"Libravatar Justin Lebar4-4/+4
2014-03-31gc --aggressive: make --depth configurableLibravatar Nguyễn Thái Ngọc Duy1-1/+7
2014-03-28Merge branch 'bp/commit-p-editor'Libravatar Junio C Hamano5-17/+38
2014-03-28Merge branch 'fr/add-interactive-argv-array'Libravatar Junio C Hamano1-11/+10
2014-03-28Merge branch 'jk/pack-bitmap-progress'Libravatar Junio C Hamano1-11/+19
2014-03-28Merge branch 'jk/pack-bitmap'Libravatar Junio C Hamano1-1/+11
2014-03-26apply --ignore-space-change: lines with and without leading whitespaces do no...Libravatar Junio C Hamano1-5/+7
2014-03-25object.h: centralize object flag allocationLibravatar Nguyễn Thái Ngọc Duy1-1/+1