?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
first · prev · next
rebase: allow more types of rebases to fast-forward
2020-02-16 Elijah Newrenrebase: allow more types of rebases to fast-forward
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2020-02-16 Elijah Newrent3432: make these tests work with either am or merge...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2020-02-16 Elijah Newrenrebase: fix handling of restrict_revision
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2020-02-16 Elijah Newrenrebase: make sure to pass along the quiet flag to the...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2020-02-16 Elijah Newrenrebase, sequencer: remove the broken GIT_QUIET handling
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2020-02-16 Elijah Newrent3406: simplify an already simple test
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2020-02-16 Elijah Newrenrebase (interactive-backend): fix handling of commits...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2020-02-16 Elijah Newrenrebase (interactive-backend): make --keep-empty the...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2020-01-17 Elijah Newrent3404: directly test the behavior of interest
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2020-01-17 Elijah Newrengit-rebase.txt: update description of --allow-empty...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2020-01-02 Elijah Newrenmerge-recursive: remove unnecessary oid_eq function
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2019-12-20 Elijah Newrenrebase: fix saving of --signoff state for am-based...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2019-12-19 Elijah Newrendir: consolidate similar code in treat_directory()
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2019-12-19 Elijah Newrendir: synchronize treat_leading_path() and read_directory_rec...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2019-12-19 Elijah Newrendir: fix checks on common prefix directory
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2019-12-18 Elijah Newrent3434: mark successful test as such
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2019-12-11 Elijah Newrendir: break part of read_directory_recursive() out for...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2019-12-11 Elijah Newrendir: exit before wildcard fall-through if there is...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2019-12-11 Elijah Newrendir: remove stray quote character in comment
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2019-12-11 Elijah NewrenRevert "dir.c: make 'git-status --ignored' work within...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2019-12-11 Elijah Newrent3011: demonstrate directory traversal failures
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2019-11-10 Elijah NewrenFix spelling errors in no-longer-updated-from-upstream...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2019-11-10 Elijah Newrenmultimail: fix a few simple spelling errors
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2019-11-10 Elijah Newrensha1dc: fix trivial comment spelling error
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2019-11-10 Elijah NewrenFix spelling errors in test commands
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2019-11-10 Elijah NewrenFix spelling errors in messages shown to users
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2019-11-10 Elijah NewrenFix spelling errors in names of tests
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2019-11-10 Elijah NewrenFix spelling errors in comments of testcases
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2019-11-10 Elijah NewrenFix spelling errors in code comments
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2019-11-07 Elijah Newrent6024: modernize style
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2019-11-07 Elijah Newrenname-hash.c: remove duplicate word in comment
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2019-11-07 Elijah Newrenhashmap: fix documentation misuses of -> versus .
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2019-11-07 Elijah Newrengit-filter-branch.txt: correct argument name typo
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2019-11-07 Elijah NewrenFix spelling errors in documentation outside of Documentation/
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2019-11-07 Elijah NewrenDocumentation: fix a bunch of typos, both old and new
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2019-11-02 Elijah NewrenRelNotes/2.24.0: fix self-contradictory note
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2019-11-02 Elijah NewrenRelNotes/2.24.0: typofix
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2019-10-23 Elijah Newrent604[236]: do not run setup in separate tests
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2019-10-23 Elijah Newrenmerge-recursive: fix merging a subdirectory into the...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2019-10-23 Elijah Newrenmerge-recursive: clean up get_renamed_dir_portion()
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2019-10-08 Elijah Newrenmerge-recursive: fix the fix to the diff3 common ancestor...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2019-10-03 Elijah Newrenfast-export: handle nested tags
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2019-10-03 Elijah Newrent9350: add tests for tags of things other than a commit
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2019-10-03 Elijah Newrenfast-export: allow user to request tags be marked with...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2019-10-03 Elijah Newrenfast-export: add support for --import-marks-if-exists
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2019-10-03 Elijah Newrenfast-import: add support for new 'alias' command
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2019-10-03 Elijah Newrenfast-import: allow tags to be identified by mark labels
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2019-10-03 Elijah Newrenfast-import: fix handling of deleted tags
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2019-10-02 Elijah Newrenmerge-recursive: fix the diff3 common ancestor label...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2019-10-02 Elijah Newrendir: special case check for the possibility that pathspec...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2019-09-28 Elijah Newrenfast-export: fix exporting a tag and nothing else
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2019-09-17 Elijah Newrenclean: fix theoretical path corruption
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2019-09-17 Elijah Newrenclean: rewrap overly long line
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2019-09-17 Elijah Newrenclean: avoid removing untracked files in a nested git...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2019-09-17 Elijah Newrenclean: disambiguate the definition of -d
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2019-09-17 Elijah Newrengit-clean.txt: do not claim we will delete files with...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2019-09-17 Elijah Newrendir: add commentary explaining match_pathspec_item...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2019-09-17 Elijah Newrendir: if our pathspec might match files under a dir...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2019-09-17 Elijah Newrendir: make the DO_MATCH_SUBMODULE code reusable for...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2019-09-17 Elijah Newrendir: also check directories for matching pathspecs
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2019-09-17 Elijah Newrendir: fix off-by-one error in match_pathspec_item
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2019-09-17 Elijah Newrendir: fix typo in comment
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2019-09-17 Elijah Newrent7300: add testcases showing failure to clean specified...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2019-09-05 Elijah Newrent9902: use a non-deprecated command for testing
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2019-09-05 Elijah NewrenRecommend git-filter-repo instead of git-filter-branch
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2019-09-05 Elijah Newrent6006: simplify, fix, and optimize empty message test
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2019-09-05 Elijah Newrent3427: accelerate this test by using fast-export and...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2019-09-01 Elijah Newrenmerge-options.txt: clarify meaning of various ff-related...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2019-08-19 Elijah Newrenmerge-recursive: alphabetize include list
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2019-08-19 Elijah Newrenmerge-recursive: add sanity checks for relevant merge_options
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2019-08-19 Elijah Newrenmerge-recursive: rename MERGE_RECURSIVE_* to MERGE_VARIANT_*
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2019-08-19 Elijah Newrenmerge-recursive: split internal fields into a separate...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2019-08-19 Elijah Newrenmerge-recursive: avoid losing output and leaking memory...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2019-08-19 Elijah Newrenmerge-recursive: comment and reorder the merge_options...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2019-08-19 Elijah Newrenmerge-recursive: consolidate unnecessary fields in...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2019-08-19 Elijah Newrenmerge-recursive: move some definitions around to clean...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2019-08-19 Elijah Newrenmerge-recursive: rename merge_options argument to opt...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2019-08-19 Elijah Newrenmerge-recursive: rename 'mrtree' to 'result_tree',...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2019-08-19 Elijah Newrenmerge-recursive: use common name for ancestors/common...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2019-08-19 Elijah Newrenmerge-recursive: fix some overly long lines
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2019-08-19 Elijah Newrencache-tree: share code between functions writing an...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2019-08-19 Elijah Newrenmerge-recursive: don't force external callers to do...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2019-08-19 Elijah Newrenmerge-recursive: remove useless parameter in merge_trees()
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2019-08-19 Elijah Newrenmerge-recursive: exit early if index != head
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2019-08-19 Elijah NewrenEnsure index matches head before invoking merge machinery...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2019-08-19 Elijah Newrenmerge-recursive: remove another implicit dependency...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2019-08-19 Elijah Newrenmerge-recursive: future-proof update_file_flags() against...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2019-08-19 Elijah Newrenmerge-recursive: provide a better label for diff3 common...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2019-08-16 Elijah Newrenmerge-recursive: enforce opt->ancestor != NULL when...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2019-08-16 Elijah Newrencheckout: provide better conflict hunk description...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2019-08-16 Elijah Newrenmerge-recursive: be consistent with assert
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2019-08-16 Elijah Newrencheckout: remove duplicate code
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2019-08-12 Elijah Newrengit-fast-import.txt: clarify that multiple merge commits...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2019-08-06 Elijah Newrenmerge-recursive: avoid directory rename detection in...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2019-06-05 Elijah Newrenmerge-recursive: restore accidentally dropped setting...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2019-05-14 Elijah Newrenfast-export: do automatic reencoding of commit messages...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2019-05-14 Elijah Newrenfast-export: differentiate between explicitly UTF-8...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2019-05-14 Elijah Newrenfast-export: avoid stripping encoding header if we...
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2019-05-14 Elijah Newrenfast-import: support 'encoding' commit header
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
2019-05-14 Elijah Newrent9350: fix encoding test to actually test reencoding
Signed-off-by: Elijah Newren <newren@gmail.com>
 commit | commitdiff | tree
next
Alternate source for your git.git needs