Commits

Commit:
993f033b6f1d781a4ba7970fec46915d08e53502
From:
Stefan Sperling <stsp@stsp.name>
Date:
make 'got ref -d' print reference name and value like the new -X options do
diff | patch | tree
Commit:
643b85bcb48e24fd2ca96d415d8e61e1ceef9aad
From:
Stefan Sperling <stsp@stsp.name>
Date:
new -X option for removing backups created by got rebase and got histedit ok semarie
diff | patch | tree
Commit:
54d5be07768d1e312078b5eb60f0e32738a1631a
From:
Stefan Sperling <stsp@stsp.name>
Date:
fix unrelated changes being merged by got cherrypick/backout/rebase/histedit This was a long-standing and very annoying bug. The two xfail tests in the cherrypick test suite are passing now.
diff | patch | tree
Commit:
9e822917b02cb36e8dd86a73a51ddfd57baa6c25
From:
Stefan Sperling <stsp@stsp.name>
Date:
rebase/histedit -l: error out if no backups for the requested branch exist
diff | patch | tree
Commit:
e600f1246e15fff13251ba9d299d74a24ae579c2
From:
Stefan Sperling <stsp@stsp.name>
Date:
ensure that old commits remain referenced after rebase and histedit Create automatic "backup" references which ensure that objects from the pre-rebase or pre-histedit state remain in the repository. A new -l option for 'got rebase' and 'got histedit' lists old commits. This makes it easier to recover from botched rebase or histedit operations. Removal of such objects currently requires got ref -d and git-gc. This will be made more convenient in the future. testing and ok jrick
diff | patch | tree
Commit:
df3ed485f4148d31d1b555abb99fcba42c1a49b7
From:
Stefan Sperling <stsp@stsp.name>
Date:
simplify the error message shown when 'got rebase' has nothing to do
diff | patch | tree
Commit:
54c39596938ae6d19fe5eede072d36a3f61baa12
From:
Stefan Sperling <stsp@stsp.name>
Date:
use POSIX [s1 = s2] syntax instead of [s1 == s2]; patch by Ryo ONODERA
diff | patch | tree
Commit:
a615e0e7796ea1103a6e0d4b5dbb613459788666
From:
Stefan Sperling <stsp@stsp.name>
Date:
implicitly mark all files in work tree as up-to-date after rebase/histedit This should always be correct, since rebase and histedit start out with a clean and single-base-commit worktree, and end up committing all changes across the entire work tree when they are successful. tested by jrick and myself
diff | patch | tree
Commit:
f6cae3ed1ef0c22150181eeebb8f9e97db99dc5a
From:
Christian Weisgerber <naddy@mips.inka.de>
Date:
switch function declarations from Korn shell to Bourne/POSIX shell syntax ok stsp
diff | patch | tree
Commit:
7fb414ae4d46ebdaeff458477ba801f9ad5853c4
From:
Stefan Sperling <stsp@stsp.name>
Date:
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
Commit:
70551d57b9f537ed14de697c1d7c552d26c12e5a
From:
Stefan Sperling <stsp@stsp.name>
Date:
add a test for rebase file index corruption problem fix in previous commit ok tracey
diff | patch | tree
Commit:
9627c110bee81b5d7368441eaf4e661010ba9cd5
From:
Stefan Sperling <stsp@stsp.name>
Date:
show a summary of conflicts and related problems after updating/merging files ok millert@
diff | patch | tree
Commit:
a740a1b3a79d96ad7bbb80e74148e5396e81ee43
From:
Stefan Sperling <stsp@stsp.name>
Date:
use 'got commit' in test_rebase_delete_missing_file instead of Git
diff | patch | tree
Commit:
ca6da77d8aee06c8367716562165d1a2f824faf8
From:
Stefan Sperling <stsp@stsp.name>
Date:
add a test for 'got rebase' to check behaviour on delete vs. delete
diff | patch | tree
Commit:
e31abbf21f99a7312bdfd392f33ace285feadfe5
From:
Stefan Sperling <stsp@stsp.name>
Date:
add -c option to 'got ref' which now expects just one argument after options
diff | patch | tree