Merge branch 'dp/pid-uintmax'

Junio C Hamano committed about 18 years ago

gitweb: ref markers link to named shortlogs

Giuseppe Bilotta committed about 18 years ago

Merge branch 'maint'

Junio C Hamano committed about 18 years ago

t5300: improve SHA1 collision test

Nicolas Pitre committed about 18 years ago

pack-objects: don't include missing preferred base objects

Nicolas Pitre committed about 18 years ago

sha1write: don't copy full sized buffers

Nicolas Pitre committed about 18 years ago

Merge branch 'np/maint-safer-pack' into np/pack

Junio C Hamano committed about 18 years ago

Makefile: add merge_recursive.h to LIB_H

Miklos Vajna committed about 18 years ago

cherry-pick/revert: make direct internal call to merge_tree()

Miklos Vajna committed about 18 years ago

Improve documentation for --dirstat diff option

Heikki Orsila committed about 18 years ago

Bring local clone's origin URL in line with that of a remote clone

Johan Herland committed about 18 years ago

Documentation: minor cleanup in a use case in 'git stash' manual

SZEDER Gábor committed about 18 years ago

Documentation: fix disappeared lines in 'git stash' manpage

SZEDER Gábor committed about 18 years ago

Documentation: fix reference to a for-each-ref option

SZEDER Gábor committed about 18 years ago

Merge branch 'maint'

Shawn O. Pearce committed about 18 years ago

git-gui: Fix string escaping in po2msg.sh

Alexander Gavrilov committed about 18 years ago

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