Commits

Commit:
b93c7142c142ac5699accd8dd259187a22e200fb
From:
Stefan Sperling <stsp@stsp.name>
Date:
add histedit -e option which runs the 'edit' script command for every commit ok jrick
diff | patch | tree
Commit:
cd33da4893c91d59c1e0a4f296e07c08cfd82bcb
From:
Stefan Sperling <stsp@stsp.name>
Date:
interrupt 'got histedit' upon missing/unversioned/not-deleted files
diff | patch | tree
Commit:
1fa4907213af37d50029ee33b989867f41f0f124
From:
Stefan Sperling <stsp@stsp.name>
Date:
interrupt 'got rebase' upon missing/unversioned/not-deleted files
diff | patch | tree
Commit:
c1b057235b48f7b8bc01bd3c31348517856bc68b
From:
Stefan Sperling <stsp@stsp.name>
Date:
make 'got merge' interrupt the merge upon undeleted and unversioned files
diff | patch | tree
Commit:
35ca1db76b33010a85a6d0e68e5d78d451028269
From:
Stefan Sperling <stsp@stsp.name>
Date:
print additional stats about things that went wrong during a merge
diff | patch | tree
Commit:
0ff8d236625b5d8329e10e9b812cbdef76917ba6
From:
Stefan Sperling <stsp@stsp.name>
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@
diff | patch | tree
Commit:
088449d31db27c8682d5e9dc737d92d05df6605e
From:
Stefan Sperling <stsp@stsp.name>
Date:
implement 'got merge -n' which interrupts before creating a merge commit
diff | patch | tree
Commit:
4e91ef1519233965edd1bbd83f6699f669c8f9d6
From:
Stefan Sperling <stsp@stsp.name>
Date:
make it possible to merge vendor branches with 'got merge'
diff | patch | tree
Commit:
5c02d2a555dc01ac06db5a47b8c81adf2bf3f8a6
From:
Stefan Sperling <stsp@stsp.name>
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.
diff | patch | tree
Commit:
1acd48bccbe935fbbd39c3387b92b0fb6aaf444f
From:
Stefan Sperling <stsp@stsp.name>
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.
diff | patch | tree
Commit:
f259c4c18277237ced1043033cb1af739f73db28
From:
Stefan Sperling <stsp@stsp.name>
Date:
add a 'got merge' command for creating merge commits Additional testing by Thomas Adam. ok tracey
diff | patch | tree
Commit:
4f3c844beaeb6a0b30565833e0481b8de9a5106e
From:
Stefan Sperling <stsp@stsp.name>
Date:
make 'got update' display the worktree's branch name upon success ok tracey
diff | patch | tree
Commit:
788d4a19ed0ddf9df069f9a6d5a8ecd9ebf932ee
From:
Stefan Sperling <stsp@stsp.name>
Date:
validate status codes given to 'got status -S'
diff | patch | tree
Commit:
b043307bfaa7ea801d19677c0cdb5d4074c0c234
From:
Stefan Sperling <stsp@stsp.name>
Date:
make got status -s and -S options conflict
diff | patch | tree
Commit:
08e5873e99dff11184476ccc3186fbd2a97a2e0b
From:
Stefan Sperling <stsp@stsp.name>
Date:
make 'got checkout' display the checked out reference and commit ID ok tracey
diff | patch | tree