rerere: return strbuf from handle path

Thomas Gummerer committed about 8 years ago

rerere: factor out handle_conflict function

Thomas Gummerer committed about 8 years ago

rerere: only return whether a path has conflicts or not

Thomas Gummerer committed about 8 years ago

rerere: fix crash with files rerere can't handle

Thomas Gummerer committed about 8 years ago

rerere: add documentation for conflict normalization

Thomas Gummerer committed about 8 years ago

rerere: mark strings for translation

Thomas Gummerer committed about 8 years ago

t3430: demonstrate what -r, --autosquash & --exec should do

Johannes Schindelin committed about 8 years ago

t4150: fix broken test for am --scissors

Andrei Rybak committed about 8 years ago

builtin/rebase: support running "git rebase <upstream>"

Pratik Karki committed about 8 years ago

rebase: refactor common shell functions into their own file

Pratik Karki committed about 8 years ago

rebase: start implementing it as a builtin

Pratik Karki committed about 8 years ago

pull --rebase=<type>: allow single-letter abbreviations for the type

Johannes Schindelin committed about 8 years ago

add a script to diff rendered documentation

Jeff King committed about 8 years ago

config: document git config getter return value

Han-Wen Nienhuys committed about 8 years ago

config.txt: reorder blame stuff to keep config keys sorted

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

t3031: update test description to mention desired behavior

Elijah Newren committed about 8 years ago

builtin/submodule--helper: factor out method to update a single submodule

Stefan Beller committed about 8 years ago

builtin/submodule--helper: store update_clone information in a struct

Stefan Beller committed about 8 years ago

builtin/submodule--helper: factor out submodule updating

Stefan Beller committed about 8 years ago

git-submodule.sh: rename unused variables

Stefan Beller committed about 8 years ago