Google Git
Sign in
googlers / jrn / git / ea3f7e598c8f1171f0bd02da777dc526cdb8424d / merge.c
  1. e1ff0a3 read-cache.c: kill read_index() by Nguyễn Thái Ngọc Duy · 6 years ago
  2. 3a95f31 repository.c: replace hold_locked_index() with repo_hold_locked_index() by Nguyễn Thái Ngọc Duy · 6 years ago
  3. 7e196c3 merge.c: remove implicit dependency on the_index by Nguyễn Thái Ngọc Duy · 7 years ago
  4. c18ac30 Merge branch 'en/dirty-merge-fixes' by Junio C Hamano · 7 years ago
  5. cffbfad read-cache.c: move index_has_changes() from merge.c by Elijah Newren · 7 years ago
  6. e47dbec Merge branch 'ma/unpack-trees-free-msgs' by Junio C Hamano · 7 years ago
  7. 1c41d28 unpack_trees_options: free messages when done by Martin Ågren · 7 years ago
  8. 89e653d merge: setup `opts` later in `checkout_fast_forward()` by Martin Ågren · 7 years ago
  9. e9fe6f2 merge: convert empty tree constant to the_hash_algo by brian m. carlson · 7 years ago
  10. 5790d25 merge: always roll back lock in `checkout_fast_forward()` by Martin Ågren · 7 years ago
  11. b6825b5 Merge branch 'ew/empty-merge-with-dirty-index-maint' into ew/empty-merge-with-dirty-index by Junio C Hamano · 7 years ago
  12. b101793 move index_has_changes() from builtin/am.c to merge.c for reuse by Elijah Newren · 7 years ago
  13. df60cf5 read-cache: leave lock in right state in `write_locked_index()` by Martin Ågren · 7 years ago
  14. 837e34e treewide: prefer lockfiles on the stack by Martin Ågren · 7 years ago
  15. a9dbc17 tree: convert parse_tree_indirect to struct object_id by brian m. carlson · 8 years ago
  16. f06e90d merge: convert checkout_fast_forward to struct object_id by brian m. carlson · 8 years ago
  17. 3f061bf lockfile: LOCK_REPORT_ON_ERROR by Junio C Hamano · 8 years ago
  18. 55f5704 sequencer: lib'ify checkout_fast_forward() by Johannes Schindelin · 9 years ago
  19. f2fd076 Convert struct object to object_id by brian m. carlson · 9 years ago
  20. 697cc8e lockfile.h: extract new header file for the functions in lockfile.c by Michael Haggerty · 10 years ago
  21. 788cef8 Merge branch 'nd/split-index' by Junio C Hamano · 11 years ago
  22. 5c1753b merge: use argv_array when spawning merge strategy by Jeff King · 11 years ago
  23. 03b8664 read-cache: new API write_locked_index instead of write_index/write_cache by Nguyễn Thái Ngọc Duy · 11 years ago
  24. db699a8 Move try_merge_command and checkout_fast_forward to libgit.a by Nguyễn Thái Ngọc Duy · 12 years ago