transport-helper: mismerge fix

Felipe Contreras committed almost 13 years ago

t: replace pulls with merges

Felipe Contreras committed almost 13 years ago

merge: simplify ff-only option

Felipe Contreras committed almost 13 years ago

Fix '\%o' for printf from coreutils

Kacper Kornet committed almost 13 years ago

remote-curl: fix large pushes with GSSAPI

Brian M. Carlson committed almost 13 years ago

remote-curl: pass curl slot_results back through run_slot

Jeff King committed almost 13 years ago

http: return curl's AUTHAVAIL via slot_results

Jeff King committed almost 13 years ago

gitk: Tag display improvements

Paul Mackerras committed almost 14 years ago

fetch: improve the error messages emitted for conflicting refspecs

Michael Haggerty committed almost 13 years ago

handle_duplicate(): mark error message for translation

Michael Haggerty committed almost 13 years ago

ref_remote_duplicates(): extract a function handle_duplicate()

Michael Haggerty committed almost 13 years ago

ref_remove_duplicates(): simplify loop logic

Michael Haggerty committed almost 13 years ago

t5536: new test of refspec conflicts when fetching

Michael Haggerty committed almost 13 years ago

ref_remove_duplicates(): avoid redundant bisection

Michael Haggerty committed almost 13 years ago

git-fetch.txt: improve description of tag auto-following

Michael Haggerty committed almost 13 years ago

fetch-options.txt: simplify ifdef/ifndef/endif usage

Michael Haggerty committed almost 13 years ago

fetch, remote: properly convey --no-prune options to subprocesses

Michael Haggerty committed almost 13 years ago

builtin/remote.c:update(): use struct argv_array

Michael Haggerty committed almost 13 years ago

builtin/remote.c: reorder function definitions

Michael Haggerty committed almost 13 years ago

query_refspecs(): move some constants out of the loop

Michael Haggerty committed almost 13 years ago