Commit Briefs

Stefan Sperling

fix ignores when a path is passed to 'got status'

Problem reported by semarie, who also provided initial regression test code. 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

make 'got status' read .gitignore files; support **/ and /**/ in patterns

diff | patch | tree

Stefan Sperling

make 'got status' ignore inaccessible directories (reported by semarie)

diff | patch | tree

Stefan Sperling

make 'got status' find top-level .cvsignore when invoked from a subdir

diff | patch | tree

Stefan Sperling

add support for .cvsignore files, as found in /usr/ports, to 'got status'

diff | patch | tree

Stefan Sperling

add support for multiple path arguments to 'got status'

diff | patch | tree

Stefan Sperling

fix 'got status' recursion problems

diff | patch | tree

Stefan Sperling

make test_status_obstructed show failure output

diff | patch | tree

Stefan Sperling

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

diff | patch | tree

Stefan Sperling

make 'got status' detect and indicate merge conflict markers

diff | patch | tree

Stefan Sperling

add a basic implementation of 'got rm'

diff | patch | tree

Stefan Sperling

implement a basic 'got add' command

diff | patch | tree

Stefan Sperling

fix get_file_status() for files larger than blob read buffer size

diff | patch | tree

Stefan Sperling

make 'got status' ignore symlinks, for now

diff | patch | tree