t4214: explicitly list tags in log

Denton Liu committed almost 7 years ago

t4214: generate expect in their own test cases

Denton Liu committed almost 7 years ago

t4214: use test_merge

Denton Liu committed almost 7 years ago

test-lib: let test_merge() perform octopus merges

Denton Liu committed almost 7 years ago

docs: clarify trace2 version invariants

Josh Steadmon committed almost 7 years ago

docs: mention trace2 target-dir mode in git-config

Josh Steadmon committed almost 7 years ago

treewide: remove duplicate #include directives

René Scharfe committed almost 7 years ago

push: do not pretend to return `int` from `die_push_simple()`

Johannes Schindelin committed almost 7 years ago

fast-export: handle nested tags

Elijah Newren committed almost 7 years ago

t9350: add tests for tags of things other than a commit

Elijah Newren committed almost 7 years ago

fast-export: allow user to request tags be marked with --mark-tags

Elijah Newren committed almost 7 years ago

fast-export: add support for --import-marks-if-exists

Elijah Newren committed almost 7 years ago

fast-import: add support for new 'alias' command

Elijah Newren committed almost 7 years ago

fast-import: allow tags to be identified by mark labels

Elijah Newren committed almost 7 years ago

fast-import: fix handling of deleted tags

Elijah Newren committed almost 7 years ago

add -i: show progress counter in the prompt

Kunal Tyagi committed almost 7 years ago

Merge branch 'bw/diff3-conflict-style'

Pratyush Yadav committed almost 7 years ago

git-gui: support for diff3 conflict style

Bert Wesarg committed almost 7 years ago

range-diff: internally force `diff.noprefix=true`

Johannes Schindelin committed almost 7 years ago

ci: run `hdr-check` as part of the `Static Analysis` job

Johannes Schindelin committed almost 7 years ago