Commits
- Commit:
f69721c3fc6f5a7b7a11a49a1fd7a99182ef01f0
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
show base commit hash and omit filenames in conflict markers
- Commit:
d136cfcb987bd2fd865f8711449dc47b7f63455f
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
show original file content in conflict markers
- Commit:
4c9641fdb639da1d7ad1bde82b3010e5ac1e096f
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix and simplify blame algorithm
Always diff against latest version of file. This is much easier
since there is no need to keep track of lines shifting around.
- Commit:
ad7de6a5165442ec89b9daaadb18901a981befee
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
remove unused function got_diff_blob_file_lines_changed()
- Commit:
a7c9878d5b0e7770339e76efc0821897fe7a6be8
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make stage -p show the number of changes in a file
- Commit:
dc424a06a9c1f0f664cee320cc1b34752f33ec97
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
initial 'got stage -p' implementation
- Commit:
7f1f93af7593347c6efde1bc79997fbff2b64ef2
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
introduce got_diff_blob_file_lines_changed()
- Commit:
01a44956166c76e44f58809e5a1ea1477adfef80
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
declare conflict marker strings in got_lib_diff.h
- Commit:
57ee5d5084c5c07c321352b7412a51d2f89ef298
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
allow callers of diff3 code to detect merge conflicts
- Commit:
a551f2158d980464de9ecc41bab55ff7143103d7
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
diff3: make labels work and fix leaks
- Commit:
9f98de9c4993b8b5ae95cedf9b1d916f6618a887
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
declare got_merge_diff3()
- Commit:
acb209ee710a07170e5cf7fe8103dbab0666549b
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
restore support for D_NORMAL diffs of regular files
- Commit:
404c43c4fa13923747c649f395f5b2bcb9fcd484
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
basic 'got blame' implementation
- Commit:
e97248b0f4809130bbab608a1fe9992702b77e38
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
prune unused declarations from got_lib_diff.h
- Commit:
c48ceb4cb5c011dd474de08159b58efa8cb3c76e
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
remove support for the ifdef diff format from diffreg
- Commit:
1afa8e435b1e169d19d571b0aab45bd36a3d5eff
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
remove REVERSE and NREVERSE diff output options from diffreg
- Commit:
6525c300e6e810bc7fc439416623ab9d322195f4
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
forgot to delete D_EDIT in previous
- Commit:
119f86008e60f53160896ee4658c9d16c7a5f13a
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
remove support for "normal" diff output from diffreg
- Commit:
84e118513c1ae7e7793fc4e8553f4b06dbb53ec7
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
remove support for context diffs from diffreg.c
- Commit:
a2a848a2c08da760904b78a9ecd593785af177f3
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
remove ignore-lines pattern support from diffreg code
- Commit:
7673568311fd48da1f7f7c2b331a72a4c8744f83
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
move diffreg's max_context into struct got_diff_state
- Commit:
718b3ab0e353c4ccb510b0ec9c3673b1c9a7344e
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
rename the library-internal headers again to a common prefix