You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Tree: 60aced3dfa

main

maint

master

next

seen

todo

gitgui-0.10.0

gitgui-0.10.1

gitgui-0.10.2

gitgui-0.11.0

gitgui-0.12.0

gitgui-0.13.0

gitgui-0.14.0

gitgui-0.15.0

gitgui-0.16.0

gitgui-0.17.0

gitgui-0.18.0

gitgui-0.19.0

gitgui-0.20.0

gitgui-0.21.0

gitgui-0.6.0

gitgui-0.6.1

gitgui-0.6.2

gitgui-0.6.3

gitgui-0.6.4

gitgui-0.6.5

gitgui-0.7.0

gitgui-0.7.0-rc1

gitgui-0.7.1

gitgui-0.7.2

gitgui-0.7.3

gitgui-0.7.4

gitgui-0.7.5

gitgui-0.8.0

gitgui-0.8.1

gitgui-0.8.2

gitgui-0.8.3

gitgui-0.8.4

gitgui-0.9.0

gitgui-0.9.1

gitgui-0.9.2

gitgui-0.9.3

junio-gpg-pub

v0.99

v0.99.1

v0.99.2

v0.99.3

v0.99.4

v0.99.5

v0.99.6

v0.99.7

v0.99.7a

v0.99.7b

v0.99.7c

v0.99.7d

v0.99.8

v0.99.8a

v0.99.8b

v0.99.8c

v0.99.8d

v0.99.8e

v0.99.8f

v0.99.8g

v0.99.9

v0.99.9a

v0.99.9b

v0.99.9c

v0.99.9d

v0.99.9e

v0.99.9f

v0.99.9g

v0.99.9h

v0.99.9i

v0.99.9j

v0.99.9k

v0.99.9l

v0.99.9m

v0.99.9n

v1.0.0

v1.0.0a

v1.0.0b

v1.0.1

v1.0.10

v1.0.11

v1.0.12

v1.0.13

v1.0.2

v1.0.3

v1.0.4

v1.0.5

v1.0.6

v1.0.7

v1.0.8

v1.0.9

v1.0rc1

v1.0rc2

v1.0rc3

v1.0rc4

v1.0rc5

v1.0rc6

v1.1.0

v1.1.1

v1.1.2

v1.1.3

v1.1.4

v1.1.5

v1.1.6

v1.2.0

v1.2.1

v1.2.2

v1.2.3

v1.2.4

v1.2.5

v1.2.6

v1.3.0

v1.3.0-rc1

v1.3.0-rc2

v1.3.0-rc3

v1.3.0-rc4

v1.3.1

v1.3.2

v1.3.3

v1.4.0

v1.4.0-rc1

v1.4.0-rc2

v1.4.1

v1.4.1-rc1

v1.4.1-rc2

v1.4.1.1

v1.4.2

v1.4.2-rc1

v1.4.2-rc2

v1.4.2-rc3

v1.4.2-rc4

v1.4.2.1

v1.4.2.2

v1.4.2.3

v1.4.2.4

v1.4.3

v1.4.3-rc1

v1.4.3-rc2

v1.4.3-rc3

v1.4.3.1

v1.4.3.2

v1.4.3.3

v1.4.3.4

v1.4.3.5

v1.4.4

v1.4.4-rc1

v1.4.4-rc2

v1.4.4.1

v1.4.4.2

v1.4.4.3

v1.4.4.4

v1.4.4.5

v1.5.0

v1.5.0-rc0

v1.5.0-rc1

v1.5.0-rc2

v1.5.0-rc3

v1.5.0-rc4

v1.5.0.1

v1.5.0.2

v1.5.0.3

v1.5.0.4

v1.5.0.5

v1.5.0.6

v1.5.0.7

v1.5.1

v1.5.1-rc1

v1.5.1-rc2

v1.5.1-rc3

v1.5.1.1

v1.5.1.2

v1.5.1.3

v1.5.1.4

v1.5.1.5

v1.5.1.6

v1.5.2

v1.5.2-rc0

v1.5.2-rc1

v1.5.2-rc2

v1.5.2-rc3

v1.5.2.1

v1.5.2.2

v1.5.2.3

v1.5.2.4

v1.5.2.5

v1.5.3

v1.5.3-rc0

v1.5.3-rc1

v1.5.3-rc2

v1.5.3-rc3

v1.5.3-rc4

v1.5.3-rc5

v1.5.3-rc6

v1.5.3-rc7

v1.5.3.1

v1.5.3.2

v1.5.3.3

v1.5.3.4

v1.5.3.5

v1.5.3.6

v1.5.3.7

v1.5.3.8

v1.5.4

v1.5.4-rc0

v1.5.4-rc1

v1.5.4-rc2

v1.5.4-rc3

v1.5.4-rc4

v1.5.4-rc5

v1.5.4.1

v1.5.4.2

v1.5.4.3

v1.5.4.4

v1.5.4.5

v1.5.4.6

v1.5.4.7

v1.5.5

v1.5.5-rc0

v1.5.5-rc1

v1.5.5-rc2

v1.5.5-rc3

v1.5.5.1

v1.5.5.2

v1.5.5.3

v1.5.5.4

v1.5.5.5

v1.5.5.6

v1.5.6

v1.5.6-rc0

v1.5.6-rc1

v1.5.6-rc2

v1.5.6-rc3

v1.5.6.1

v1.5.6.2

v1.5.6.3

v1.5.6.4

v1.5.6.5

v1.5.6.6

v1.6.0

v1.6.0-rc0

v1.6.0-rc1

v1.6.0-rc2

v1.6.0-rc3

v1.6.0.1

v1.6.0.2

v1.6.0.3

v1.6.0.4

v1.6.0.5

v1.6.0.6

v1.6.1

v1.6.1-rc1

v1.6.1-rc2

v1.6.1-rc3

v1.6.1-rc4

v1.6.1.1

v1.6.1.2

v1.6.1.3

v1.6.1.4

v1.6.2

v1.6.2-rc0

v1.6.2-rc1

v1.6.2-rc2

v1.6.2.1

v1.6.2.2

v1.6.2.3

v1.6.2.4

v1.6.2.5

v1.6.3

v1.6.3-rc0

v1.6.3-rc1

v1.6.3-rc2

v1.6.3-rc3

v1.6.3-rc4

v1.6.3.1

v1.6.3.2

v1.6.3.3

v1.6.3.4

v1.6.4

v1.6.4-rc0

v1.6.4-rc1

v1.6.4-rc2

v1.6.4-rc3

v1.6.4.1

v1.6.4.2

v1.6.4.3

v1.6.4.4

v1.6.4.5

v1.6.5

v1.6.5-rc0

v1.6.5-rc1

v1.6.5-rc2

v1.6.5-rc3

v1.6.5.1

v1.6.5.2

v1.6.5.3

v1.6.5.4

v1.6.5.5

v1.6.5.6

v1.6.5.7

v1.6.5.8

v1.6.5.9

v1.6.6

v1.6.6-rc0

v1.6.6-rc1

v1.6.6-rc2

v1.6.6-rc3

v1.6.6-rc4

v1.6.6.1

v1.6.6.2

v1.6.6.3

v1.7.0

v1.7.0-rc0

v1.7.0-rc1

v1.7.0-rc2

v1.7.0.1

v1.7.0.2

v1.7.0.3

v1.7.0.4

v1.7.0.5

v1.7.0.6

v1.7.0.7

v1.7.0.8

v1.7.0.9

v1.7.1

v1.7.1-rc0

v1.7.1-rc1

v1.7.1-rc2

v1.7.1.1

v1.7.1.2

v1.7.1.3

v1.7.1.4

v1.7.10

v1.7.10-rc0

v1.7.10-rc1

v1.7.10-rc2

v1.7.10-rc3

v1.7.10-rc4

v1.7.10.1

v1.7.10.2

v1.7.10.3

v1.7.10.4

v1.7.10.5

v1.7.11

v1.7.11-rc0

v1.7.11-rc1

v1.7.11-rc2

v1.7.11-rc3

v1.7.11.1

v1.7.11.2

v1.7.11.3

v1.7.11.4

v1.7.11.5

v1.7.11.6

v1.7.11.7

v1.7.12

v1.7.12-rc0

v1.7.12-rc1

v1.7.12-rc2

v1.7.12-rc3

v1.7.12.1

v1.7.12.2

v1.7.12.3

v1.7.12.4

v1.7.2

v1.7.2-rc0

v1.7.2-rc1

v1.7.2-rc2

v1.7.2-rc3

v1.7.2.1

v1.7.2.2

v1.7.2.3

v1.7.2.4

v1.7.2.5

v1.7.3

v1.7.3-rc0

v1.7.3-rc1

v1.7.3-rc2

v1.7.3.1

v1.7.3.2

v1.7.3.3

v1.7.3.4

v1.7.3.5

v1.7.4

v1.7.4-rc0

v1.7.4-rc1

v1.7.4-rc2

v1.7.4-rc3

v1.7.4.1

v1.7.4.2

v1.7.4.3

v1.7.4.4

v1.7.4.5

v1.7.5

v1.7.5-rc0

v1.7.5-rc1

v1.7.5-rc2

v1.7.5-rc3

v1.7.5.1

v1.7.5.2

v1.7.5.3

v1.7.5.4

v1.7.6

v1.7.6-rc0

v1.7.6-rc1

v1.7.6-rc2

v1.7.6-rc3

v1.7.6.1

v1.7.6.2

v1.7.6.3

v1.7.6.4

v1.7.6.5

v1.7.6.6

v1.7.7

v1.7.7-rc0

v1.7.7-rc1

v1.7.7-rc2

v1.7.7-rc3

v1.7.7.1

v1.7.7.2

v1.7.7.3

v1.7.7.4

v1.7.7.5

v1.7.7.6

v1.7.7.7

v1.7.8

v1.7.8-rc0

v1.7.8-rc1

v1.7.8-rc2

v1.7.8-rc3

v1.7.8-rc4

v1.7.8.1

v1.7.8.2

v1.7.8.3

v1.7.8.4

v1.7.8.5

v1.7.8.6

v1.7.9

v1.7.9-rc0

v1.7.9-rc1

v1.7.9-rc2

v1.7.9.1

v1.7.9.2

v1.7.9.3

v1.7.9.4

v1.7.9.5

v1.7.9.6

v1.7.9.7

v1.8.0

v1.8.0-rc0

v1.8.0-rc1

v1.8.0-rc2

v1.8.0-rc3

v1.8.0.1

v1.8.0.2

v1.8.0.3

v1.8.1

v1.8.1-rc0

v1.8.1-rc1

v1.8.1-rc2

v1.8.1-rc3

v1.8.1.1

v1.8.1.2

v1.8.1.3

v1.8.1.4

v1.8.1.5

v1.8.1.6

v1.8.2

v1.8.2-rc0

v1.8.2-rc1

v1.8.2-rc2

v1.8.2-rc3

v1.8.2.1

v1.8.2.2

v1.8.2.3

v1.8.3

v1.8.3-rc0

v1.8.3-rc1

v1.8.3-rc2

v1.8.3-rc3

v1.8.3.1

v1.8.3.2

v1.8.3.3

v1.8.3.4

v1.8.4

v1.8.4-rc0

v1.8.4-rc1

v1.8.4-rc2

v1.8.4-rc3

v1.8.4-rc4

v1.8.4.1

v1.8.4.2

v1.8.4.3

v1.8.4.4

v1.8.4.5

v1.8.5

v1.8.5-rc0

v1.8.5-rc1

v1.8.5-rc2

v1.8.5-rc3

v1.8.5.1

v1.8.5.2

v1.8.5.3

v1.8.5.4

v1.8.5.5

v1.8.5.6

v1.9-rc0

v1.9-rc1

v1.9-rc2

v1.9.0

v1.9.0-rc3

v1.9.1

v1.9.2

v1.9.3

v1.9.4

v1.9.5

v2.0.0

v2.0.0-rc0

v2.0.0-rc1

v2.0.0-rc2

v2.0.0-rc3

v2.0.0-rc4

v2.0.1

v2.0.2

v2.0.3

v2.0.4

v2.0.5

v2.1.0

v2.1.0-rc0

v2.1.0-rc1

v2.1.0-rc2

v2.1.1

v2.1.2

v2.1.3

v2.1.4

v2.10.0

v2.10.0-rc0

v2.10.0-rc1

v2.10.0-rc2

v2.10.1

v2.10.2

v2.10.3

v2.10.4

v2.10.5

v2.11.0

v2.11.0-rc0

v2.11.0-rc1

v2.11.0-rc2

v2.11.0-rc3

v2.11.1

v2.11.2

v2.11.3

v2.11.4

v2.12.0

v2.12.0-rc0

v2.12.0-rc1

v2.12.0-rc2

v2.12.1

v2.12.2

v2.12.3

v2.12.4

v2.12.5

v2.13.0

v2.13.0-rc0

v2.13.0-rc1

v2.13.0-rc2

v2.13.1

v2.13.2

v2.13.3

v2.13.4

v2.13.5

v2.13.6

v2.13.7

v2.14.0

v2.14.0-rc0

v2.14.0-rc1

v2.14.1

v2.14.2

v2.14.3

v2.14.4

v2.14.5

v2.14.6

v2.15.0

v2.15.0-rc0

v2.15.0-rc1

v2.15.0-rc2

v2.15.1

v2.15.2

v2.15.3

v2.15.4

v2.16.0

v2.16.0-rc0

v2.16.0-rc1

v2.16.0-rc2

v2.16.1

v2.16.2

v2.16.3

v2.16.4

v2.16.5

v2.16.6

v2.17.0

v2.17.0-rc0

v2.17.0-rc1

v2.17.0-rc2

v2.17.1

v2.17.2

v2.17.3

v2.17.4

v2.17.5

v2.17.6

v2.18.0

v2.18.0-rc0

v2.18.0-rc1

v2.18.0-rc2

v2.18.1

v2.18.2

v2.18.3

v2.18.4

v2.18.5

v2.19.0

v2.19.0-rc0

v2.19.0-rc1

v2.19.0-rc2

v2.19.1

v2.19.2

v2.19.3

v2.19.4

v2.19.5

v2.19.6

v2.2.0

v2.2.0-rc0

v2.2.0-rc1

v2.2.0-rc2

v2.2.0-rc3

v2.2.1

v2.2.2

v2.2.3

v2.20.0

v2.20.0-rc0

v2.20.0-rc1

v2.20.0-rc2

v2.20.1

v2.20.2

v2.20.3

v2.20.4

v2.20.5

v2.21.0

v2.21.0-rc0

v2.21.0-rc1

v2.21.0-rc2

v2.21.1

v2.21.2

v2.21.3

v2.21.4

v2.22.0

v2.22.0-rc0

v2.22.0-rc1

v2.22.0-rc2

v2.22.0-rc3

v2.22.1

v2.22.2

v2.22.3

v2.22.4

v2.22.5

v2.23.0

v2.23.0-rc0

v2.23.0-rc1

v2.23.0-rc2

v2.23.1

v2.23.2

v2.23.3

v2.23.4

v2.24.0

v2.24.0-rc0

v2.24.0-rc1

v2.24.0-rc2

v2.24.1

v2.24.2

v2.24.3

v2.24.4

v2.25.0

v2.25.0-rc0

v2.25.0-rc1

v2.25.0-rc2

v2.25.1

v2.25.2

v2.25.3

v2.25.4

v2.25.5

v2.26.0

v2.26.0-rc0

v2.26.0-rc1

v2.26.0-rc2

v2.26.1

v2.26.2

v2.26.3

v2.27.0

v2.27.0-rc0

v2.27.0-rc1

v2.27.0-rc2

v2.27.1

v2.28.0

v2.28.0-rc0

v2.28.0-rc1

v2.28.0-rc2

v2.28.1

v2.29.0

v2.29.0-rc0

v2.29.0-rc1

v2.29.0-rc2

v2.29.1

v2.29.2

v2.29.3

v2.3.0

v2.3.0-rc0

v2.3.0-rc1

v2.3.0-rc2

v2.3.1

v2.3.10

v2.3.2

v2.3.3

v2.3.4

v2.3.5

v2.3.6

v2.3.7

v2.3.8

v2.3.9

v2.30.0

v2.30.0-rc0

v2.30.0-rc1

v2.30.0-rc2

v2.30.1

v2.30.2

v2.30.3

v2.30.4

v2.30.5

v2.30.6

v2.30.7

v2.30.8

v2.30.9

v2.31.0

v2.31.0-rc0

v2.31.0-rc1

v2.31.0-rc2

v2.31.1

v2.31.2

v2.31.3

v2.31.4

v2.31.5

v2.31.6

v2.31.7

v2.31.8

v2.32.0

v2.32.0-rc0

v2.32.0-rc1

v2.32.0-rc2

v2.32.0-rc3

v2.32.1

v2.32.2

v2.32.3

v2.32.4

v2.32.5

v2.32.6

v2.32.7

v2.33.0

v2.33.0-rc0

v2.33.0-rc1

v2.33.0-rc2

v2.33.1

v2.33.2

v2.33.3

v2.33.4

v2.33.5

v2.33.6

v2.33.7

v2.33.8

v2.34.0

v2.34.0-rc0

v2.34.0-rc1

v2.34.0-rc2

v2.34.1

v2.34.2

v2.34.3

v2.34.4

v2.34.5

v2.34.6

v2.34.7

v2.34.8

v2.35.0

v2.35.0-rc0

v2.35.0-rc1

v2.35.0-rc2

v2.35.1

v2.35.2

v2.35.3

v2.35.4

v2.35.5

v2.35.6

v2.35.7

v2.35.8

v2.36.0

v2.36.0-rc0

v2.36.0-rc1

v2.36.0-rc2

v2.36.1

v2.36.2

v2.36.3

v2.36.4

v2.36.5

v2.36.6

v2.37.0

v2.37.0-rc0

v2.37.0-rc1

v2.37.0-rc2

v2.37.1

v2.37.2

v2.37.3

v2.37.4

v2.37.5

v2.37.6

v2.37.7

v2.38.0

v2.38.0-rc0

v2.38.0-rc1

v2.38.0-rc2

v2.38.1

v2.38.2

v2.38.3

v2.38.4

v2.38.5

v2.39.0

v2.39.0-rc0

v2.39.0-rc1

v2.39.0-rc2

v2.39.1

v2.39.2

v2.39.3

v2.4.0

v2.4.0-rc0

v2.4.0-rc1

v2.4.0-rc2

v2.4.0-rc3

v2.4.1

v2.4.10

v2.4.11

v2.4.12

v2.4.2

v2.4.3

v2.4.4

v2.4.5

v2.4.6

v2.4.7

v2.4.8

v2.4.9

v2.40.0

v2.40.0-rc0

v2.40.0-rc1

v2.40.0-rc2

v2.40.1

v2.41.0

v2.41.0-rc0

v2.41.0-rc1

v2.41.0-rc2

v2.5.0

v2.5.0-rc0

v2.5.0-rc1

v2.5.0-rc2

v2.5.0-rc3

v2.5.1

v2.5.2

v2.5.3

v2.5.4

v2.5.5

v2.5.6

v2.6.0

v2.6.0-rc0

v2.6.0-rc1

v2.6.0-rc2

v2.6.0-rc3

v2.6.1

v2.6.2

v2.6.3

v2.6.4

v2.6.5

v2.6.6

v2.6.7

v2.7.0

v2.7.0-rc0

v2.7.0-rc1

v2.7.0-rc2

v2.7.0-rc3

v2.7.1

v2.7.2

v2.7.3

v2.7.4

v2.7.5

v2.7.6

v2.8.0

v2.8.0-rc0

v2.8.0-rc1

v2.8.0-rc2

v2.8.0-rc3

v2.8.0-rc4

v2.8.1

v2.8.2

v2.8.3

v2.8.4

v2.8.5

v2.8.6

v2.9.0

v2.9.0-rc0

v2.9.0-rc1

v2.9.0-rc2

v2.9.1

v2.9.2

v2.9.3

v2.9.4

v2.9.5

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from '60aced3dfa'

${ noResults }

git/mergetools

History

Bill Ritcher 6ceb658c99 mergetools: add support for guiffy ... Add guiffy as difftool and mergetool guiffy is available on Windows, Linux, and MacOS Signed-off-by: Bill Ritcher <Bill_Ritcher@guiffy.com> Reviewed-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>		7 years ago
..
araxis	mergetool: honor mergetool.$tool.trustExitCode for built-in tools	8 years ago
bc	mergetool: honor mergetool.$tool.trustExitCode for built-in tools	8 years ago
bc3	mergetool: rename bc3 to bc	10 years ago
codecompare	mergetool: honor mergetool.$tool.trustExitCode for built-in tools	8 years ago
deltawalker	mergetool: honor mergetool.$tool.trustExitCode for built-in tools	8 years ago
diffmerge	mergetool: honor mergetool.$tool.trustExitCode for built-in tools	8 years ago
diffuse	mergetool: honor mergetool.$tool.trustExitCode for built-in tools	8 years ago
ecmerge	mergetool: honor mergetool.$tool.trustExitCode for built-in tools	8 years ago
emerge	mergetool: honor mergetool.$tool.trustExitCode for built-in tools	8 years ago
examdiff	mergetool: honor mergetool.$tool.trustExitCode for built-in tools	8 years ago
guiffy	mergetools: add support for guiffy	7 years ago
gvimdiff	…
gvimdiff2	…
gvimdiff3	mergetools: add vimdiff3 mode	11 years ago
kdiff3	mergetool: honor mergetool.$tool.trustExitCode for built-in tools	8 years ago
kompare	mergetool: honor mergetool.$tool.trustExitCode for built-in tools	8 years ago
meld	mergetools/meld: improve compatibiilty with Meld on macOS X	8 years ago
opendiff	mergetool: honor mergetool.$tool.trustExitCode for built-in tools	8 years ago
p4merge	mergetool: honor mergetool.$tool.trustExitCode for built-in tools	8 years ago
tkdiff	mergetool: honor mergetool.$tool.trustExitCode for built-in tools	8 years ago
tortoisemerge	mergetool: honor mergetool.$tool.trustExitCode for built-in tools	8 years ago
vimdiff	mergetools/vimdiff: trust Vim's exit code	8 years ago
vimdiff2	…
vimdiff3	mergetools: add vimdiff3 mode	11 years ago
winmerge	mergetool: honor mergetool.$tool.trustExitCode for built-in tools	8 years ago
xxdiff	Merge branch 'da/mergetool-xxdiff-hotkey'	8 years ago