Junio C Hamano 3b9d69ec22 Merge branch 'js/lift-parent-count-limit' ...

There is no reason to have a hardcoded upper limit of the number of
parents for an octopus merge, created via the graft mechanism.

* js/lift-parent-count-limit:
  Remove the line length limit for graft files

2014-01-10 10:33:36 -08:00

..

add.c

Merge branch 'nd/add-empty-fix'

2014-01-10 10:33:03 -08:00

annotate.c

…

apply.c

replace {pre,suf}fixcmp() with {starts,ends}_with()

2013-12-05 14:13:21 -08:00

archive.c

replace {pre,suf}fixcmp() with {starts,ends}_with()

2013-12-05 14:13:21 -08:00

bisect--helper.c

Replace deprecated OPT_BOOLEAN by OPT_BOOL

2013-08-05 11:32:19 -07:00

blame.c

Merge branch 'js/lift-parent-count-limit'

2014-01-10 10:33:36 -08:00

branch.c

Merge branch 'cc/starts-n-ends-with'

2013-12-17 12:02:44 -08:00

bundle.c

…

cat-file.c

Merge branch 'jk/oi-delta-base'

2014-01-10 10:33:11 -08:00

check-attr.c

Merge branch 'sb/parseopt-boolean-removal'

2013-09-04 12:39:03 -07:00

check-ignore.c

Merge branch 'dw/check-ignore-sans-index'

2013-09-20 12:37:32 -07:00

check-mailmap.c

builtin: add git-check-mailmap command

2013-07-13 10:19:37 -07:00

check-ref-format.c

…

checkout-index.c

Merge branch 'nd/lift-path-max'

2013-10-30 12:10:56 -07:00

checkout.c

Merge branch 'cc/starts-n-ends-with'

2013-12-17 12:02:44 -08:00

clean.c

replace {pre,suf}fixcmp() with {starts,ends}_with()

2013-12-05 14:13:21 -08:00

clone.c

Merge branch 'nd/transport-positive-depth-only'

2013-12-17 12:03:29 -08:00

column.c

replace {pre,suf}fixcmp() with {starts,ends}_with()

2013-12-05 14:13:21 -08:00

commit-tree.c

commit-tree: document -S option consistently

2013-03-25 15:01:22 -07:00

commit.c

Merge branch 'cc/starts-n-ends-with'

2013-12-17 12:02:44 -08:00

config.c

repo-config: remove deprecated alias for "git config"

2013-11-12 14:10:17 -08:00

count-objects.c

count-objects: add -H option to humanize sizes

2013-04-10 13:27:26 -07:00

credential.c

git credential fill: output the whole 'struct credential'

2012-06-25 11:56:24 -07:00

describe.c

replace {pre,suf}fixcmp() with {starts,ends}_with()

2013-12-05 14:13:21 -08:00

diff-files.c

convert read_cache_preload() to take struct pathspec

2013-07-15 10:56:08 -07:00

diff-index.c

convert read_cache_preload() to take struct pathspec

2013-07-15 10:56:08 -07:00

diff-tree.c

…

diff.c

Merge branch 'tg/diff-no-index-refactor'

2013-12-27 14:58:17 -08:00

fast-export.c

Merge branch 'cc/starts-n-ends-with'

2013-12-17 12:02:44 -08:00

fetch-pack.c

Merge branch 'tb/clone-ssh-with-colon-for-port'

2013-12-17 12:03:32 -08:00

fetch.c

fetch --prune: Run prune before fetching

2014-01-03 10:18:40 -08:00

fmt-merge-msg.c

replace {pre,suf}fixcmp() with {starts,ends}_with()

2013-12-05 14:13:21 -08:00

for-each-ref.c

Merge branch 'maint'

2013-12-30 12:27:01 -08:00

fsck.c

replace {pre,suf}fixcmp() with {starts,ends}_with()

2013-12-05 14:13:21 -08:00

gc.c

gc: notice gc processes run by other users

2014-01-02 16:15:29 -08:00

get-tar-commit-id.c

stop installing git-tar-tree link

2013-12-03 12:35:22 -08:00

grep.c

Merge branch 'mg/more-textconv'

2013-10-23 13:21:31 -07:00

hash-object.c

hash-object: replace stdin parsing OPT_BOOLEAN by OPT_COUNTUP

2013-08-07 08:30:55 -07:00

help.c

replace {pre,suf}fixcmp() with {starts,ends}_with()

2013-12-05 14:13:21 -08:00

index-pack.c

replace {pre,suf}fixcmp() with {starts,ends}_with()

2013-12-05 14:13:21 -08:00

init-db.c

replace {pre,suf}fixcmp() with {starts,ends}_with()

2013-12-05 14:13:21 -08:00

log.c

replace {pre,suf}fixcmp() with {starts,ends}_with()

2013-12-05 14:13:21 -08:00

ls-files.c

Merge branch 'jc/ls-files-killed-optim' into maint

2013-10-23 13:33:08 -07:00

ls-remote.c

replace {pre,suf}fixcmp() with {starts,ends}_with()

2013-12-05 14:13:21 -08:00

ls-tree.c

Merge branch 'jl/submodule-mv'

2013-09-09 14:36:15 -07:00

mailinfo.c

replace {pre,suf}fixcmp() with {starts,ends}_with()

2013-12-05 14:13:21 -08:00

mailsplit.c

mailsplit: sort maildir filenames more cleverly

2013-03-02 22:52:44 -08:00

merge-base.c

Merge branch 'bm/merge-base-octopus-dedup'

2014-01-10 10:33:33 -08:00

merge-file.c

Replace deprecated OPT_BOOLEAN by OPT_BOOL

2013-08-05 11:32:19 -07:00

merge-index.c

Convert "struct cache_entry *" to "const ..." wherever possible

2013-07-09 09:12:48 -07:00

merge-ours.c

…

merge-recursive.c

replace {pre,suf}fixcmp() with {starts,ends}_with()

2013-12-05 14:13:21 -08:00

merge-tree.c

merge-tree: handle directory/empty conflict correctly

2013-05-06 22:17:00 -07:00

merge.c

replace {pre,suf}fixcmp() with {starts,ends}_with()

2013-12-05 14:13:21 -08:00

mktag.c

…

mktree.c

i18n: mktree: mark parseopt strings for translation

2012-08-20 12:23:18 -07:00

mv.c

mv: let 'git mv file no-such-dir/' error out

2013-12-04 11:49:15 -08:00

name-rev.c

Merge branch 'cc/starts-n-ends-with'

2013-12-17 12:02:44 -08:00

notes.c

replace {pre,suf}fixcmp() with {starts,ends}_with()

2013-12-05 14:13:21 -08:00

pack-objects.c

do not pretend sha1write returns errors

2013-12-26 11:50:20 -08:00

pack-redundant.c

Fix sizeof usage in get_permutations

2012-12-13 11:13:44 -08:00

pack-refs.c

pack-refs: merge code from pack-refs.{c,h} into refs.{c,h}

2013-05-01 15:33:11 -07:00

patch-id.c

…

prune-packed.c

prune-packed: use strbuf to avoid having to worry about PATH_MAX

2013-12-17 10:43:30 -08:00

prune.c

Merge branch 'mh/path-max'

2014-01-10 10:32:21 -08:00

push.c

Merge branch 'jc/push-refmap'

2013-12-27 14:57:50 -08:00

read-tree.c

C: have space around && and || operators

2013-10-16 10:26:39 -07:00

receive-pack.c

replace {pre,suf}fixcmp() with {starts,ends}_with()

2013-12-05 14:13:21 -08:00

reflog.c

replace {pre,suf}fixcmp() with {starts,ends}_with()

2013-12-05 14:13:21 -08:00

remote-ext.c

…

remote-fd.c

…

remote.c

Merge branch 'cc/starts-n-ends-with'

2013-12-17 12:02:44 -08:00

repack.c

Sync with 1.8.5.2

2013-12-17 14:12:17 -08:00

replace.c

replace info: rename 'full' to 'long' and clarify in-code symbols

2013-12-30 12:33:11 -08:00

rerere.c

rerere: convert to use parse_pathspec

2013-07-15 10:56:07 -07:00

reset.c

reset: pass real rev name to add--interactive

2013-10-25 14:54:18 -07:00

rev-list.c

C: have space around && and || operators

2013-10-16 10:26:39 -07:00

rev-parse.c

Merge branch 'jk/rev-parse-double-dashes'

2013-12-27 14:58:01 -08:00

revert.c

Merge branch 'hu/cherry-pick-previous-branch'

2013-10-23 13:21:35 -07:00

rm.c

rm: re-use parse_pathspec's trailing-slash removal

2013-09-13 12:37:35 -07:00

send-pack.c

replace {pre,suf}fixcmp() with {starts,ends}_with()

2013-12-05 14:13:21 -08:00

shortlog.c

replace {pre,suf}fixcmp() with {starts,ends}_with()

2013-12-05 14:13:21 -08:00

show-branch.c

Merge branch 'cc/starts-n-ends-with'

2013-12-17 12:02:44 -08:00

show-ref.c

replace {pre,suf}fixcmp() with {starts,ends}_with()

2013-12-05 14:13:21 -08:00

stripspace.c

builtin/stripspace.c: fix broken indentation

2013-09-06 13:33:17 -07:00

symbolic-ref.c

replace {pre,suf}fixcmp() with {starts,ends}_with()

2013-12-05 14:13:21 -08:00

tag.c

replace {pre,suf}fixcmp() with {starts,ends}_with()

2013-12-05 14:13:21 -08:00

unpack-file.c

…

unpack-objects.c

replace {pre,suf}fixcmp() with {starts,ends}_with()

2013-12-05 14:13:21 -08:00

update-index.c

Merge branch 'jl/submodule-mv'

2013-09-09 14:36:15 -07:00

update-ref.c

replace {pre,suf}fixcmp() with {starts,ends}_with()

2013-12-05 14:13:21 -08:00

update-server-info.c

i18n: update-server-info: mark parseopt strings for translation

2012-08-22 10:58:29 -07:00

upload-archive.c

replace {pre,suf}fixcmp() with {starts,ends}_with()

2013-12-05 14:13:21 -08:00

var.c

…

verify-pack.c

i18n: verify-pack: mark parseopt strings for translation

2012-08-22 10:58:29 -07:00

verify-tag.c

gpg_interface: allow to request status return

2013-02-14 09:30:04 -08:00

write-tree.c

i18n: write-tree: mark parseopt strings for translation

2012-08-22 10:58:29 -07:00