git gui: show diffs with a minimum of 1 context line

Clemens Buchacher committed about 18 years ago

git-merge documentation: describe how conflict is presented

Junio C Hamano committed about 18 years ago

checkout --conflict=<style>: recreate merge in a non-default style

Junio C Hamano committed about 18 years ago

Merge branch 'tr/rev-list-docs' into tr/filter-branch

Junio C Hamano committed about 18 years ago

cast pid_t's to uintmax_t to improve portability

David Soria Parra committed about 18 years ago

Merge branch 'maint'

Junio C Hamano committed about 18 years ago

t6013: replace use of 'tac' with equivalent Perl

Thomas Rast committed about 18 years ago

Document sendemail.envelopesender configuration

Ask Bjørn Hansen committed about 18 years ago

Document clarification: gitmodules, gitattributes

Gustaf Hendeby committed about 18 years ago

git-add --intent-to-add (-N)

Junio C Hamano committed about 18 years ago

Add help.autocorrect to enable/disable autocorrecting

Alex Riesen committed about 18 years ago

git wrapper: DWIM mistyped commands

Johannes Schindelin committed about 18 years ago

'git foo' program identifies itself without dash in die() messages

Junio C Hamano committed about 18 years ago

setup_git_directory(): fix move to worktree toplevel directory

Nguyễn Thái Ngọc Duy committed about 18 years ago

update-index: fix worktree setup

Nguyễn Thái Ngọc Duy committed about 18 years ago

config.txt: Add missing colons after option name

Teemu Likonen committed about 18 years ago

git commit --author=$name: look $name up in existing commits

Junio C Hamano committed about 18 years ago

diff: vary default prefix depending on what are compared

Junio C Hamano committed about 18 years ago

builtin-merge: avoid run_command_v_opt() for recursive and subtree

Miklos Vajna committed about 18 years ago

merge-recursive: introduce merge_options

Miklos Vajna committed about 18 years ago