Latest commit 843d94b Jan 6, 2018 @gitster gitster Merge branch 'ew/empty-merge-with-dirty-index'
"git merge -s recursive" did not correctly abort when the index is
dirty, if the merged tree happened to be the same as the current
HEAD, which has been fixed.

* ew/empty-merge-with-dirty-index:
  merge-recursive: avoid incorporating uncommitted changes in a merge
  move index_has_changes() from builtin/am.c to merge.c for reuse
  t6044: recursive can silently incorporate dirty changes in a merge
Permalink
..
Failed to load latest commit information.
add.c Merge branch 'tb/add-renormalize' Nov 27, 2017
am.c Merge branch 'ew/empty-merge-with-dirty-index' Jan 5, 2018
annotate.c annotate: use argv_array Jul 16, 2014
apply.c apply: move lockfile into `apply_state` Oct 6, 2017
archive.c archive: read local configuration Nov 22, 2016
bisect--helper.c bisect: mention "view" as an alternative to "visualize" Nov 13, 2017
blame.c diff: make struct diff_flags members lowercase Nov 1, 2017
branch.c Merge branch 'ks/branch-cleanup' Dec 27, 2017
bundle.c bundle: use prefix_filename with bundle path Mar 21, 2017
cat-file.c Merge branch 'jk/fallthrough' Sep 28, 2017
check-attr.c config: don't include config.h by default Jun 15, 2017
check-ignore.c Merge branch 'bw/config-h' Jun 24, 2017
check-mailmap.c config: don't include config.h by default Jun 15, 2017
check-ref-format.c Merge branch 'jc/check-ref-format-oor' into maint Nov 15, 2017
checkout-index.c checkout-index: simplify locking logic Oct 6, 2017
checkout.c Merge branch 'ks/branch-cleanup' Dec 27, 2017
clean.c Merge branch 'jk/ref-filter-colors-fix' Oct 18, 2017
clone.c Merge branch 'jt/transport-hide-vtable' Dec 28, 2017
column.c config: don't include config.h by default Jun 15, 2017
commit-tree.c Merge branch 'rk/commit-tree-make-F-verbatim' Sep 19, 2017
commit.c Merge branch 'ma/reduce-heads-leakfix' Nov 15, 2017
config.c config: add --expiry-date Nov 18, 2017
count-objects.c pack: move open_pack_index(), parse_pack_index() Aug 23, 2017
credential.c credential: handle invalid arguments earlier May 30, 2017
describe.c Merge branch 'sb/describe-blob' Dec 28, 2017
diff-files.c submodule: remove gitmodules_config Aug 3, 2017
diff-index.c Merge branch 'ma/builtin-unleak' Oct 7, 2017
diff-tree.c diff-tree: read the index so attribute checks work in bare repositories Dec 6, 2017
diff.c Switch empty tree and blob lookups to use hash abstraction Nov 13, 2017
difftool.c read-cache: leave lock in right state in `write_locked_index()` Oct 7, 2017
fast-export.c decorate: clean up and document API Dec 8, 2017
fetch-pack.c Rename sha1_array to oid_array Mar 31, 2017
fetch.c Merge branch 'jt/transport-hide-vtable' Dec 28, 2017
fmt-merge-msg.c Merge branch 'rs/fmt-merge-msg-string-leak-fix' Dec 27, 2017
for-each-ref.c provide --color option for all ref-filter users Oct 4, 2017
fsck.c Merge branch 'bp/read-index-from-skip-verification' Nov 15, 2017
gc.c Merge branch 'aw/gc-lockfile-fscanf-fix' Sep 25, 2017
get-tar-commit-id.c distinguish error versus short read from read_in_full() Sep 27, 2017
grep.c Merge branch 'bw/pathspec-match-submodule-boundary' Dec 19, 2017
hash-object.c sha1_file: convert hash_sha1_file_literally to struct object_id Aug 21, 2017
help.c Merge branch 'ks/help-alias-label' Sep 25, 2017
index-pack.c index-pack: use skip_to_optional_arg() Dec 12, 2017
init-db.c add UNLEAK annotation for reducing leak false positives Sep 8, 2017
interpret-trailers.c Merge branch 'jk/trailers-parse' Aug 27, 2017
log.c log: add option to choose which refs to decorate Nov 22, 2017
ls-files.c Merge branch 'bp/fsmonitor' Nov 21, 2017
ls-remote.c wildmatch: remove unused wildopts parameter Jun 24, 2017
ls-tree.c Merge branch 'bw/config-h' Jun 24, 2017
mailinfo.c prefix_filename: return newly allocated string Mar 21, 2017
mailsplit.c mailinfo & mailsplit: check for EOF while parsing May 8, 2017
merge-base.c Merge branch 'ma/reduce-heads-leakfix' Nov 15, 2017
merge-file.c config: don't include config.h by default Jun 15, 2017
merge-index.c Convert GIT_SHA1_HEXSZ used for allocation to GIT_MAX_HEXSZ Mar 27, 2017
merge-ours.c Merge branch 'bw/diff-opt-impl-to-bitfields' Nov 9, 2017
merge-recursive.c i18n: merge-recursive: mark verbose message for translation Sep 15, 2016
merge-tree.c tree-walk: convert fill_tree_descriptor() to object_id Aug 14, 2017
merge.c merge: add config option for verifySignatures Dec 12, 2017
mktag.c usage: do not insist that standard input must come from a file Oct 16, 2015
mktree.c mktree: plug memory leaks reported by Coverity May 8, 2017
mv.c submodule: convert stage_updated_gitmodules to take a struct index_state Dec 12, 2017
name-rev.c Merge branch 'ma/builtin-unleak' Oct 7, 2017
notes.c Merge branch 'ot/pretty' Dec 27, 2017
pack-objects.c Merge branch 'jh/object-filtering' Dec 27, 2017
pack-redundant.c pack: move pack name-related functions Aug 23, 2017
pack-refs.c refs: delete pack_refs() in favor of refs_pack_refs() Apr 14, 2017
patch-id.c config: don't include config.h by default Jun 15, 2017
prune-packed.c Merge branch 'jt/packmigrate' Aug 27, 2017
prune.c Merge branch 'rd/man-prune-progress' Dec 6, 2017
pull.c Merge branch 'bc/hash-algo' Dec 13, 2017
push.c builtin/push.c: add push.pushOption config Oct 24, 2017
read-tree.c submodule: remove gitmodules_config Aug 3, 2017
rebase--helper.c rebase -i: learn to abbreviate command names Dec 5, 2017
receive-pack.c Merge branch 'bw/protocol-v1' Dec 6, 2017
reflog.c config: add --expiry-date Nov 18, 2017
remote-ext.c consistently use "fallthrough" comments in switches Sep 22, 2017
remote-fd.c remote-{ext,fd}: print usage message on invalid arguments May 30, 2017
remote.c Merge branch 'mh/tidy-ref-update-flags' Nov 15, 2017
repack.c Merge branch 'bw/config-h' Jun 24, 2017
replace.c refs: convert read_ref and read_ref_full to object_id Oct 16, 2017
rerere.c avoid "write_in_full(fd, buf, len) != len" pattern Sep 14, 2017
reset.c Merge branch 'ot/pretty' Dec 27, 2017
rev-list.c Merge branch 'jh/object-filtering' Dec 27, 2017
rev-parse.c refs: convert dwim_ref and expand_ref to struct object_id Oct 16, 2017
revert.c cherry-pick/revert: reject --rerere-autoupdate when continuing Aug 2, 2017
rm.c submodule: convert stage_updated_gitmodules to take a struct index_state Dec 12, 2017
send-pack.c Merge branch 'ma/parse-maybe-bool' Aug 22, 2017
shortlog.c shortlog: skip format/parse roundtrip for internal traversal Sep 8, 2017
show-branch.c Merge branch 'ot/pretty' Dec 27, 2017
show-ref.c refs: convert peel_ref to struct object_id Oct 16, 2017
stripspace.c config: don't include config.h by default Jun 15, 2017
submodule--helper.c Merge branch 'pc/submodule-helper' Dec 13, 2017
symbolic-ref.c refs: rename constant `REF_NODEREF` to `REF_NO_DEREF` Nov 6, 2017
tag.c Merge branch 'bc/object-id' Nov 6, 2017
unpack-file.c Merge branch 'jk/write-in-full-fix' Sep 25, 2017
unpack-objects.c cleanup: fix possible overflow errors in binary search Oct 9, 2017
update-index.c Merge branch 'bp/fsmonitor' Nov 21, 2017
update-ref.c refs: rename constant `REF_NODEREF` to `REF_NO_DEREF` Nov 6, 2017
update-server-info.c config: don't include config.h by default Jun 15, 2017
upload-archive.c upload-archive: handle "-h" option early May 30, 2017
var.c config: don't include config.h by default Jun 15, 2017
verify-commit.c Merge branch 'bw/config-h' Jun 24, 2017
verify-pack.c config: don't include config.h by default Jun 15, 2017
verify-tag.c Merge branch 'jk/ref-filter-colors' Aug 11, 2017
worktree.c Merge branch 'es/worktree-checkout-hook' Dec 27, 2017
write-tree.c config: don't include config.h by default Jun 15, 2017