Merge branch 'jl/add-n-ignore-missing'

Junio C Hamano committed over 16 years ago

Documentation: Explain git-mergetool's use of temporary files

David Aguilar committed over 16 years ago

Documentation/reset: move "undo permanently" example behind "make topic"

Thomas Rast committed over 16 years ago

Documentation/reset: reorder examples to match description

Thomas Rast committed over 16 years ago

Documentation/reset: promote 'examples' one section up

Thomas Rast committed over 16 years ago

Documentation/reset: separate options by mode

Thomas Rast committed over 16 years ago

Documentation/git-reset: reorder modes for soft-mixed-hard progression

Thomas Rast committed over 16 years ago

git-svn: write memoized data explicitly to avoid Storable bug

Sergey Vlasov committed over 16 years ago

Merge branch 'jc/diff-merge-base-multi'

Junio C Hamano committed over 16 years ago

post-receive-email: optional message line count limit

Kevin P. Fleming committed over 16 years ago

revert: improve success message by adding abbreviated commit sha1

Christian Couder committed over 16 years ago

revert: don't print "Finished one cherry-pick." if commit failed

Christian Couder committed over 16 years ago

revert: refactor commit code into a new run_git_commit() function

Christian Couder committed over 16 years ago

revert: report success when using option --strategy

Christian Couder committed over 16 years ago

Only run aggregate-results over actual counts

Thomas Rast committed over 16 years ago

Add a sample user for the svndump library

Jonathan Nieder committed over 16 years ago

diff A...B: do not limit the syntax too narrowly

Junio C Hamano committed over 16 years ago

Export parse_date_basic() to convert a date string to timestamp

Jonathan Nieder committed over 16 years ago

Merge branch 'jn/paginate-fix'

Junio C Hamano committed over 16 years ago

Merge branch 'wp/merge-tree-fix'

Junio C Hamano committed over 16 years ago