Commit Briefs

Stefan Sperling

sort and de-duplicate work tree path command line arguments

This is important in cases like 'got diff file.txt file.txt' which should only show the diff for file.txt once. suggested by kn@

diff | patch | tree

Stefan Sperling

implement 'got diff -c' for diffing commits with optional filtering by path

Need for filtering by path sugggested by kn@ ok naddy@

diff | patch | tree

Stefan Sperling

add support for multiple path arguments to 'got diff'

positive feedback from Omar and kn ok kn

diff | patch | tree

Stefan Sperling

make 'got update' display the worktree's branch name upon success

ok tracey

diff | patch | tree

Stefan Sperling

use POSIX [s1 = s2] syntax instead of [s1 == s2]; patch by Ryo ONODERA

diff | patch | tree

Christian Weisgerber

replace echo with printf, stop option processing with "--" for portability

ok stsp

diff | patch | tree

Stefan Sperling

consistently label removed files as "/dev/null" in diff headers

diff | patch | tree

Stefan Sperling

handle binary files in got/tog diff commands; add -a options to force text

diff | patch | tree

Stefan Sperling

add a test for diffing binary files; got diff behaves like 'diff -a'

diff | patch | tree

Christian Weisgerber

switch function declarations from Korn shell to Bourne/POSIX shell syntax

ok stsp

diff | patch | tree

Stefan Sperling

add a -q option to tests for quiet output and use it for 'make regress'

Previous default output remains when test cases are run individually. ok tracey

diff | patch | tree

Stefan Sperling

add support for symlinks in the repository to 'got diff'

diff | patch | tree

Stefan Sperling

fix symlink change in test_diff_symlinks_in_work_tree

diff | patch | tree

Stefan Sperling

make 'got diff' show changes to symlinks in a work tree

diff | patch | tree

Stefan Sperling

add submodule tests

ok semarie

diff | patch | tree

Stefan Sperling

show a summary of conflicts and related problems after updating/merging files

ok millert@

diff | patch | tree

Stefan Sperling

support Git-style "lightweight" tags as arguments for 'got diff'

diff | patch | tree

Stefan Sperling

show base commit hash and omit filenames in conflict markers

diff | patch | tree

Stefan Sperling

show file mode differences when diffing trees

diff | patch | tree

Stefan Sperling

show original file content in conflict markers

diff | patch | tree

Stefan Sperling

add -w (ignore whitespace) option to 'got diff'

diff | patch | tree

Stefan Sperling

indicate non-existent paths in 'got status' and make 'got diff' error for them

diff | patch | tree

Stefan Sperling

add support for tag objects to 'got diff'

diff | patch | tree

Stefan Sperling

use cmp -s, instead of cmp, in all command line tests

diff | patch | tree

Stefan Sperling

add some diff tests

diff | patch | tree