Commits
- Commit:
2777a00400ba964b25ac62b33acdd6677af6ae80
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
align 'diff -c' usage help with synopsis given in man page; suggested by naddy
- Commit:
cc8021afc28da386d1cab85b4d74b632b90e0108
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
implement 'got diff -c' for diffing commits with optional filtering by path
Need for filtering by path sugggested by kn@
ok naddy@
- Commit:
238050ce7b9ba6527d21b357cea92a51d94d39cc
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
remove code which was setting up repo_path redundantly from cmd_diff()
- Commit:
30f6c0c64b5c08d79e22cc2c0bd1f1340288a7f5
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
add support for multiple path arguments to 'got diff'
positive feedback from Omar and kn
ok kn
- Commit:
d52bac284bc87b2e54ff8afd22886a7260f68b26
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
ignore unversioned files while aborting rebase, histedit, merge or operations
ok jrick
- Commit:
c50a74557db04e5ab02a1b0c53cb4fbdd64088ac
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
add histedit -e option which runs the 'edit' script command for every commit
ok jrick
- Commit:
dddbe150a21f404e9c42033d9b00b5561001df7e
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
interrupt 'got histedit' upon missing/unversioned/not-deleted files
- Commit:
bb494413b7b04767e20fc5a04378d517cda008ad
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
interrupt 'got rebase' upon missing/unversioned/not-deleted files
- Commit:
ba1629912dc172d6dfe5d0c09cb1e60c15c01899
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
make 'got merge' interrupt the merge upon undeleted and unversioned files
- Commit:
0ef688596bd8c81c1cf6abdee7aedc07e1cbcbbc
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
print additional stats about things that went wrong during a merge
- Commit:
ae1e948a3179529896cf69272a0c1b45ab8ced1c
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
show commit progress output when 'got merge -c' is used
Otherwise no progress output is shown at all with this command.
Commit progress output will also display any additional changes
which resulted from conflict resolution.
ok millert@
- Commit:
ba34626bc13877c93836c8ee873acf1be8429ead
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
implement 'got merge -n' which interrupts before creating a merge commit
- Commit:
768705e331a0ff020ecc806142aecdecdbfb2e89
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
make it possible to merge vendor branches with 'got merge'
- Commit:
3dc1dc04a5ecf97ba3ce3f8c103c73bcfe00e31e
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
for portability, handle errno variations upon open(2) failure with O_NOFOLLOW
Problem pointed out by naddy for FreeBSD -portable.
Discussed with millert, thomas adam, and naddy.
- Commit:
88d249c247d1925b032b3d0b1ce8cac6aa7d1a6d
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
stop caring about obstructed versioned files in 'got merge'
Tyring to write a test to cover this case I found that obstructed files
are (correctly) detected as local modifications in the work tree. Thus
they trigger the pre-condition check for local modications and 'got merge'
will not even start to do any work in the presence of obstructed files.
- Commit:
10604dce6e625d11974fb5491598bbb54069e5d3
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
add a 'got merge' command for creating merge commits
Additional testing by Thomas Adam.
ok tracey
- Commit:
dd038bc6ec835ad3fd3c0b5303b8af9ad506c8cc
- From:
- Thomas Adam <thomas@xteddy.org>
- Via:
- Thomas Adam <thomas.adam@smoothwall.net>
- Date:
portable: initial Linux compilation
This commit modifies the GoT main branch to be able to compile it under
linux.
- Commit:
4f3c844beaeb6a0b30565833e0481b8de9a5106e
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make 'got update' display the worktree's branch name upon success
ok tracey
- Commit:
788d4a19ed0ddf9df069f9a6d5a8ecd9ebf932ee
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
validate status codes given to 'got status -S'
- Commit:
b043307bfaa7ea801d19677c0cdb5d4074c0c234
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make got status -s and -S options conflict
- Commit:
08e5873e99dff11184476ccc3186fbd2a97a2e0b
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make 'got checkout' display the checked out reference and commit ID
ok tracey
- Commit:
00357e4dc78f7f5bd12eceaa07592ab743996e12
- From:
- Tracey Emery <tracey@traceyemery.net>
- Date:
add suppress status-code selection to got status. this allows for a quick way to
clean output without the use of ignore files. ok stsp
- Commit:
4ad4a1ec452e58730b6d841ae6a044ff53827e15
- From:
- Tracey Emery <tracey@traceyemery.net>
- Date:
add -q quiet mode to checkout and update. supressing output keeps the terminal
responsive on large repos. ok jrick stsp
- Commit:
1b796c3fa88f0d3101f3dd979d9f8b511fd93086
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix a null-pointer deref in 'got fetch -d'; reported by Omar Polo
- Commit:
5e5da8c4bcc83f7737a115b8da52fc3935fe3a6b
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
rename got_fetch_parse_uri() to got_dial_parse_uri()
This function is now being used by both 'got fetch' and 'got send' so
its former name was misleading.