diff --check: do not unconditionally complain about trailing empty lines

Junio C Hamano committed over 18 years ago

Merge branch 'maint'

Junio C Hamano committed over 18 years ago

Put in the two other configuration elements found in the source

Anand Kumria committed over 18 years ago

Put some documentation in about the parameters that have been added

Anand Kumria committed over 18 years ago

Move git-p4.syncFromOrigin into a configuration parameters section

Anand Kumria committed over 18 years ago

Consistently use 'git-p4' for the configuration entries

Anand Kumria committed over 18 years ago

If the user has configured various parameters, use them.

Anand Kumria committed over 18 years ago

Switch to using 'p4_build_cmd'

Anand Kumria committed over 18 years ago

If we are in verbose mode, output what we are about to run (or return)

Anand Kumria committed over 18 years ago

Add a single command that will be used to construct the 'p4' command

Anand Kumria committed over 18 years ago

Utilise the new 'p4_system' function.

Anand Kumria committed over 18 years ago

Have a command that specifically invokes 'p4' (via system)

Anand Kumria committed over 18 years ago

Utilise the new 'p4_read_pipe_lines' command

Anand Kumria committed over 18 years ago

Create a specific version of the read_pipe_lines command for p4 invocations

Anand Kumria committed over 18 years ago

Documentation: rev-list-options: Fix a typo

Thomas Rast committed over 18 years ago

Adjust for the new way of enabling the default post-update hook

Petr Baudis committed over 18 years ago

git-bisect: fix wrong usage of read(1)

Francis Moreau committed over 18 years ago

Fix typo in comments of longest_ancestor_length()

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

Make cherry-pick use rerere for conflict resolution.

Abhijit Menon-Sen committed over 18 years ago

checkout --track: make up a sensible branch name if '-b' was omitted

Johannes Schindelin committed over 18 years ago