git-merge: squelch needless error message.

Junio C Hamano committed almost 20 years ago

Merge

Junio C Hamano committed almost 20 years ago

Merge branch 'maint'

Junio C Hamano committed almost 20 years ago

git-reset to remove "$GIT_DIR/MERGE_MSG"

Junio C Hamano committed almost 20 years ago

merge-file: support -p and -q; fix compile warnings

Johannes Schindelin committed almost 20 years ago

Add builtin merge-file, a minimal replacement for RCS merge

Johannes Schindelin committed almost 20 years ago

cvs-migration document: make the need for "push" more obvious

Johannes Schindelin committed almost 20 years ago

git-branch: add options and tests for branch renaming

Lars Hjemli committed almost 20 years ago

git-branch: let caller specify logmsg

Lars Hjemli committed almost 20 years ago

rename_ref: use lstat(2) when testing for symlink

Lars Hjemli committed almost 20 years ago

read-tree: document --exclude-per-directory

Junio C Hamano committed almost 20 years ago

Loosen "working file will be lost" check in Porcelain-ish

Junio C Hamano committed almost 20 years ago

read-tree: further loosen "working file will be lost" check.

Junio C Hamano committed almost 20 years ago

xdl_merge(): fix and simplify conflict handling

Johannes Schindelin committed almost 20 years ago

Document git-diff whitespace flags -b and -w

Jakub Narebski committed almost 20 years ago

diff -b: ignore whitespace at end of line

Johannes Schindelin committed almost 20 years ago

Merge branch 'maint'

Junio C Hamano committed almost 20 years ago

← Newer Page 3736 of 4099 Older →