summaryrefslogtreecommitdiff
path: root/builtin/difftool.c
AgeCommit message (Expand)AuthorFilesLines
2018-06-01Merge branch 'nd/use-opt-int-set-f'Libravatar Junio C Hamano1-5/+4
2018-05-30Merge branch 'ma/lockfile-cleanup'Libravatar Junio C Hamano1-1/+1
2018-05-24Use OPT_SET_INT_F() for cmdline option specificationLibravatar Nguyễn Thái Ngọc Duy1-5/+4
2018-05-10lock_file: make function-local locks non-staticLibravatar Martin Ågren1-1/+1
2018-04-11exec_cmd: rename to use dash in file nameLibravatar Stefan Beller1-1/+1
2018-03-14sha1_file: convert read_sha1_file to struct object_idLibravatar brian m. carlson1-1/+1
2017-10-07read-cache: leave lock in right state in `write_locked_index()`Libravatar Martin Ågren1-1/+0
2017-08-20sha1_file: convert index_fd to struct object_idLibravatar Patryk Obara1-1/+1
2017-07-05builtin/difftool.c: drop hashmap_cmp_fn castLibravatar Stefan Beller1-15/+22
2017-06-30hashmap.h: compare function has access to a data fieldLibravatar Stefan Beller1-9/+15
2017-06-24Merge branch 'bw/config-h'Libravatar Junio C Hamano1-0/+1
2017-06-15config: don't include config.h by defaultLibravatar Brandon Williams1-0/+1
2017-05-08difftool: address a couple of resource/memory leaksLibravatar Johannes Schindelin1-10/+23
2017-04-13difftool: fix use-after-freeLibravatar Johannes Schindelin1-2/+5
2017-03-30difftool: avoid strcpyLibravatar Jeff King1-16/+15
2017-03-15difftool: handle modified symlinks in dir-diff modeLibravatar David Aguilar1-5/+46
2017-02-06difftool: fix bug when printing usageLibravatar David Aguilar1-4/+4
2017-01-25difftool: hack around -Wzero-length-format warningLibravatar Jeff King1-1/+1
2017-01-19difftool: retire the scripted versionLibravatar Johannes Schindelin1-41/+0
2017-01-19difftool: implement the functionality in the builtinLibravatar Johannes Schindelin1-1/+671
2017-01-17difftool: add a skeleton for the upcoming builtinLibravatar Johannes Schindelin1-0/+63