Commit Briefs

4f3c844bea Stefan Sperling

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

ok tracey

diff | patch | tree

54c3959693 Stefan Sperling

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

diff | patch | tree

578133c990 Christian Weisgerber

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

ok stsp

diff | patch | tree

1cb46f007d Stefan Sperling

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

diff | patch | tree

64453f7e55 Stefan Sperling

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

diff | patch | tree

dffd0deb2b Stefan Sperling

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

diff | patch | tree

f6cae3ed1e Christian Weisgerber

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

ok stsp

diff | patch | tree

7fb414ae4d 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

40dde666c0 Stefan Sperling

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

diff | patch | tree

4135d7d058 Stefan Sperling

fix symlink change in test_diff_symlinks_in_work_tree

diff | patch | tree

39449a05d5 Stefan Sperling

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

diff | patch | tree

e730362696 Stefan Sperling

add submodule tests

ok semarie

diff | patch | tree

9627c110be Stefan Sperling

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

ok millert@

diff | patch | tree

562580bce8 Stefan Sperling

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

diff | patch | tree

f69721c3fc Stefan Sperling

show base commit hash and omit filenames in conflict markers

diff | patch | tree

46f68b205b Stefan Sperling

show file mode differences when diffing trees

diff | patch | tree

d136cfcb98 Stefan Sperling

show original file content in conflict markers

diff | patch | tree

63035f9f4f Stefan Sperling

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

diff | patch | tree

2a06fe5f59 Stefan Sperling

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

diff | patch | tree

d24820bf83 Stefan Sperling

add support for tag objects to 'got diff'

diff | patch | tree

8d301dd94c Stefan Sperling

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

diff | patch | tree

95adcdcaec Stefan Sperling

add some diff tests

diff | patch | tree