Commits
- Commit:
14c901f1f8f27565b91c2e8a74939c74250d8521
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
split up worktree.c's merge_blob() into merge_blob() and merge_file()
- Commit:
88f33a19290ffcb0a75f9b6cdd25c1207e46b858
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
ensure that stage -p choice 'q' doesn't skip subsequent files
- Commit:
a7c9878d5b0e7770339e76efc0821897fe7a6be8
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make stage -p show the number of changes in a file
- Commit:
2db2652dc0454deeccc06ed928fca0fd063ef644
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make path arguments to 'got stage' optional
- Commit:
b353a198c5844a2e9b078ac654b6a61de00b5a13
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add 'q' response to 'got stage -p'
- Commit:
dc424a06a9c1f0f664cee320cc1b34752f33ec97
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
initial 'got stage -p' implementation
- Commit:
3aa5969eb8ee5cb9f3b8e9249c67bbfa4a2c1395
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
check the status of specified paths before staging any of them
- Commit:
aa9f82475eebfaca6496836e1a4650f9c72c7567
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
simplify a block of code in check_out_of_date()
- Commit:
f0b0c0cee4bcde602c12bf5a2be6bd107a7ced66
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix 'mv foo bar; got rm foo; got add bar' and put paths in error messages
- Commit:
f032f1f7ee503b7aa2577cf836c485f96620e772
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix and test interaction of rebase/histedit -c and 'got stage'
- Commit:
6d022e974716847d3f3c3bc97dac50e61663c49c
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
use get_worktree_paths_from_argv consistently; improves add/rm edge cases
Double 'got rm' becomes a no-op like double 'got add' already is,
and 'got add' of an already staged file is now an error.
- Commit:
9bc94a15e33f1e4458cc06bce6696a0f6048639f
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
unstage: report new current status for deleted unstaged paths
- Commit:
ad493afcc0cd483646dbd160cffcad5190f1d139
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
initial 'got unstage' implementation
- Commit:
5f8a88c62b7ec149bd4e3f5d8c91499c67b19600
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make 'got commit' work with changed stanges
- Commit:
f0b75401029052c2613a1e5dc3882976b2ab4da9
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix out-of-date check regression; only commit staged files after 'got stage'
- Commit:
a76c42e670c040cbc63fae5cedba54de3540ce3c
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
ensure that 'got update' refuses to update staged files
- Commit:
b96228443755dfeee83c33a9366be74a0323f1ad
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
ensure that 'got histedit' refuses to run while shanges are staged
- Commit:
735ef5acf12acadb028a1ec180c877c45e631f5d
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
reject staging of out-of-date files
- Commit:
ebf48fd51b015826a4c8227d238ec8533b15476c
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
handle conflicted files passed to 'got stage'
- Commit:
98eaaa123b96d372fccac64c43af97f4cf3676df
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
implement got diff -s
- Commit:
d3e7c587d4fa8caef61be4b2bbc9c388b95e7bb9
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
handle double-staging
- Commit:
24278f3006b96a0d8ff909454e8fa5ea4fc73ed3
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make 'got revert' work with staged files
- Commit:
9acbc4faa04684945483940044d1b32175a9471e
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
test 'got rm' behaviour on staged files
- Commit:
244725f25f8754428aebce708d49d3ea834faf90
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make 'got status' indicate changes relative to staged files
- Commit:
537ac44b6c471f75e8dd4abf6e16d0a775d9dded
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
pass staged blob ID to status callback