admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
e5a730a1c31cf308d9e09e3ecfbfaf3ca860ebd1
git/builtin
History
Junio C Hamano 174f9e622f Merge branch 'js/am-call-theirs-theirs-in-fallback-3way' into maint 
One part of "git am" had an oddball helper function that called
stuff from outside "his" as opposed to calling what we have "ours",
which was not gender-neutral and also inconsistent with the rest of
the system where outside stuff is usuall called "theirs" in
contrast to "ours".

* js/am-call-theirs-theirs-in-fallback-3way:
  am: counteract gender bias
2016-07-28 11:25:59 -07:00
..
add.c
add: add --chmod=+x / --chmod=-x options
2016-06-07 17:43:39 -07:00
am.c
Merge branch 'js/am-call-theirs-theirs-in-fallback-3way' into maint
2016-07-28 11:25:59 -07:00
annotate.c
…
apply.c
Merge branch 'rs/apply-name-terminate'
2016-06-03 14:38:04 -07:00
archive.c
…
bisect--helper.c
…
blame.c
Merge branch 'jc/deref-tag' into maint
2016-07-06 13:06:46 -07:00
branch.c
Merge branch 'va/i18n-misc-updates' into maint
2016-05-26 13:17:20 -07:00
bundle.c
…
cat-file.c
Merge branch 'jk/cat-file-buffered-batch-all'
2016-05-31 12:40:54 -07:00
check-attr.c
give "nbuf" strbuf a more meaningful name
2016-02-01 13:43:02 -08:00
check-ignore.c
give "nbuf" strbuf a more meaningful name
2016-02-01 13:43:02 -08:00
check-mailmap.c
strbuf: introduce strbuf_getline_{lf,nul}()
2016-01-15 10:12:51 -08:00
check-ref-format.c
use xmallocz to avoid size arithmetic
2016-02-22 14:51:09 -08:00
checkout-index.c
checkout-index: disallow "--no-stage" option
2016-02-01 13:43:49 -08:00
checkout.c
add: add --chmod=+x / --chmod=-x options
2016-06-07 17:43:39 -07:00
clean.c
Merge branch 'jk/tighten-alloc'
2016-02-26 13:37:16 -08:00
clone.c
Merge branch 'sb/clone-shallow-passthru' into maint
2016-07-11 10:44:12 -07:00
column.c
column: read lines with strbuf_getline()
2016-01-15 10:35:07 -08:00
commit-tree.c
Merge branch 'jc/commit-tree-ignore-commit-gpgsign'
2016-05-13 13:18:27 -07:00
commit.c
Merge branch 'js/find-commit-subject-ignore-leading-blanks' into maint
2016-07-28 11:25:50 -07:00
config.c
Merge branch 'jk/config-get-urlmatch' into maint
2016-04-14 18:57:43 -07:00
count-objects.c
…
credential.c
…
describe.c
Remove get_object_hash.
2015-11-20 08:02:05 -05:00
diff-files.c
diff: run arguments through precompose_argv
2016-05-13 14:35:49 -07:00
diff-index.c
diff: run arguments through precompose_argv
2016-05-13 14:35:49 -07:00
diff-tree.c
Merge branch 'ar/diff-args-osx-precompose' into maint
2016-06-06 14:27:35 -07:00
diff.c
Merge branch 'ar/diff-args-osx-precompose' into maint
2016-06-06 14:27:35 -07:00
fast-export.c
convert trivial cases to ALLOC_ARRAY
2016-02-22 14:51:09 -08:00
fetch-pack.c
fetch-pack: fix object_id of exact sha1
2016-03-01 11:19:19 -08:00
fetch.c
Merge branch 'km/fetch-do-not-free-remote-name' into maint
2016-07-11 10:44:10 -07:00
fmt-merge-msg.c
Merge branch 'rs/pop-commit' into maint
2015-12-11 11:14:13 -08:00
for-each-ref.c
ref-filter: add option to match literal pattern
2015-09-17 10:02:49 -07:00
fsck.c
fsck_head_link(): remove unneeded flag variable
2016-04-10 11:35:33 -07:00
gc.c
Merge branch 'ew/gc-auto-pack-limit-fix' into maint
2016-07-28 11:25:56 -07:00
get-tar-commit-id.c
usage: do not insist that standard input must come from a file
2015-10-16 15:27:52 -07:00
grep.c
Merge branch 'nd/ita-cleanup' into maint
2016-07-28 11:25:51 -07:00
hash-object.c
Merge branch 'jk/options-cleanup'
2016-02-10 14:20:08 -08:00
help.c
builtin/help.c: use warning_errno()
2016-05-09 12:29:08 -07:00
index-pack.c
Merge branch 'va/i18n-misc-updates' into maint
2016-05-26 13:17:20 -07:00
init-db.c
Merge branch 'jk/check-repository-format' into maint
2016-05-02 14:24:04 -07:00
interpret-trailers.c
interpret-trailers: add option for in-place editing
2016-01-14 12:22:17 -08:00
log.c
Merge branch 'xy/format-patch-base'
2016-05-23 14:54:31 -07:00
ls-files.c
Merge branch 'jk/options-cleanup'
2016-02-10 14:20:08 -08:00
ls-remote.c
ls-remote: add support for showing symrefs
2016-01-19 10:07:56 -08:00
ls-tree.c
convert trivial sprintf / strcpy calls to xsnprintf
2015-09-25 10:18:18 -07:00
mailinfo.c
mailinfo: libify
2015-10-21 15:59:34 -07:00
mailsplit.c
builtin/mailsplit.c: use error_errno()
2016-05-09 12:29:08 -07:00
merge-base.c
convert trivial cases to ALLOC_ARRAY
2016-02-22 14:51:09 -08:00
merge-file.c
builtin/merge-file.c: use error_errno()
2016-05-09 12:29:08 -07:00
merge-index.c
use sha1_to_hex_r() instead of strcpy
2015-10-05 11:08:05 -07:00
merge-ours.c
…
merge-recursive.c
convert trivial sprintf / strcpy calls to xsnprintf
2015-09-25 10:18:18 -07:00
merge-tree.c
struct name_entry: use struct object_id instead of unsigned char sha1[20]
2016-04-25 14:23:42 -07:00
merge.c
Merge branch 'en/merge-trivial-fix'
2016-04-25 15:17:15 -07:00
mktag.c
usage: do not insist that standard input must come from a file
2015-10-16 15:27:52 -07:00
mktree.c
Merge branch 'jk/tighten-alloc'
2016-02-26 13:37:16 -08:00
mv.c
Merge branch 'sb/mv-submodule-fix' into HEAD
2016-05-18 14:40:05 -07:00
name-rev.c
Merge branch 'js/name-rev-use-oldest-ref' into maint
2016-05-31 14:08:26 -07:00
notes.c
Merge branch 'sb/misc-cleanups' into HEAD
2016-05-18 14:40:15 -07:00
pack-objects.c
Merge branch 'nd/error-errno'
2016-05-17 14:38:28 -07:00
pack-redundant.c
convert trivial cases to ALLOC_ARRAY
2016-02-22 14:51:09 -08:00
pack-refs.c
…
patch-id.c
Merge branch 'rs/patch-id-use-skip-prefix'
2016-06-03 14:38:03 -07:00
prune-packed.c
…
prune.c
Merge branch 'jk/repository-extension' into maint
2015-11-03 15:32:25 -08:00
pull.c
Merge branch 'va/i18n-misc-updates'
2016-05-17 14:38:23 -07:00
push.c
Merge branch 'mm/push-default-warning'
2016-02-26 13:37:25 -08:00
read-tree.c
convert trivial sprintf / strcpy calls to xsnprintf
2015-09-25 10:18:18 -07:00
receive-pack.c
Merge branch 'dt/pre-refs-backend'
2016-04-25 15:17:15 -07:00
reflog.c
struct name_entry: use struct object_id instead of unsigned char sha1[20]
2016-04-25 14:23:42 -07:00
remote-ext.c
typofix: assorted typofixes in comments, documentation and messages
2016-05-06 13:16:37 -07:00
remote-fd.c
…
remote.c
i18n: remote: add comment for translators
2016-05-09 12:20:40 -07:00
repack.c
strbuf: introduce strbuf_getline_{lf,nul}()
2016-01-15 10:12:51 -08:00
replace.c
Merge branch 'js/replace-edit-use-editor-configuration' into maint
2016-05-06 14:53:24 -07:00
rerere.c
Sync with 2.6.1
2015-10-05 13:20:08 -07:00
reset.c
Merge branch 'js/find-commit-subject-ignore-leading-blanks' into maint
2016-07-28 11:25:50 -07:00
rev-list.c
Merge branch 'jk/rev-list-count-with-bitmap' into maint
2016-06-27 09:56:24 -07:00
rev-parse.c
Merge branch 'jk/rev-parse-local-env-vars' into maint
2016-04-14 18:57:44 -07:00
revert.c
…
rm.c
Merge branch 'nd/error-errno'
2016-05-17 14:38:28 -07:00
send-pack.c
Merge branch 'sk/send-pack-all-fix' into maint
2016-04-29 14:15:57 -07:00
shortlog.c
Merge branch 'jk/shortlog'
2016-01-28 16:10:14 -08:00
show-branch.c
Merge branch 'rs/show-branch-argv-array' into maint
2015-12-11 11:14:14 -08:00
show-ref.c
show-ref: stop using PARSE_OPT_NO_INTERNAL_HELP
2015-11-20 08:02:07 -05:00
stripspace.c
stripspace: call U+0020 a "space" instead of a "blank"
2016-01-29 16:02:34 -08:00
submodule--helper.c
submodule: remove bashism from shell script
2016-06-01 11:32:53 -07:00
symbolic-ref.c
symbolic-ref: propagate error code from create_symref()
2015-12-21 12:03:03 -08:00
tag.c
Merge branch 'st/verify-tag'
2016-04-29 12:59:09 -07:00
unpack-file.c
convert trivial sprintf / strcpy calls to xsnprintf
2015-09-25 10:18:18 -07:00
unpack-objects.c
Remove get_object_hash.
2015-11-20 08:02:05 -05:00
update-index.c
builtin/update-index.c: prefer "err" to "errno" in process_lstat_error
2016-05-09 12:29:08 -07:00
update-ref.c
…
update-server-info.c
…
upload-archive.c
builtin/upload-archive.c: use error_errno()
2016-05-09 12:29:08 -07:00
var.c
…
verify-commit.c
…
verify-pack.c
…
verify-tag.c
verify-tag: move tag verification code to tag.c
2016-04-22 14:06:46 -07:00
worktree.c
Merge branch 'nd/worktree-various-heads'
2016-05-23 14:54:29 -07:00
write-tree.c
…