repo.or.cz
/
git
/
raj.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
difftool: Wrap long lines for readability
2012-07-26
David Ag
u
i
lar
difftoo
l
: Wrap long li
n
es for
r
e
a
d
ab
i
lity
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
David Aguilar
difftool: Check al
l
re
t
urn c
o
des from compar
e
()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
Da
v
id Agu
i
lar
difftool
:
Handle finding mergetools/ in a path
wi
t
h
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
Dav
i
d
Aguilar
difftool:
Use sy
m
link
s
w
h
en diffing again
s
t the wo
r
ktr
e
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David
Aguilar
difftool
:
Call
the t
e
mp direct
o
ry "
g
it-dif
f
to
o
l
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
D
a
vid Aguilar
difftool: Mo
v
e
o
p
t
ion v
a
l
ues in
t
o a ha
s
h
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
di
f
ft
o
ol: Eliminate gl
o
bal variables
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Agui
l
a
r
d
if
f
tool
:
Simplify prin
t
_tool_help()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-03-19
Dav
i
d Aguilar
t7800: Test difftool passing
arguments to di
f
f
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-01-23
Da
v
id Aguilar
mer
g
eto
o
l: Provide a
n
empty file when needed
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-30
Dav
i
d
A
guilar
Makefile: Improv
e
compiler header dependency check
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David A
g
uila
r
mergetools
/
meld: Use '--output' when available
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Agui
l
ar
me
r
getool--
l
ib: Refactor tools into se
p
arate f
i
l
e
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
Dav
i
d Agu
i
lar
me
r
getool-
-
lib:
M
ak
e
style c
o
n
s
i
s
t
e
nt with git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
dif
f
tool--hel
p
er: Make sty
l
e consistent
w
ith git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-06-02
David Aguilar
t/
t
7503-pr
e
-commit-ho
o
k
.
sh: A
d
d GIT_PREFIX te
s
ts
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
D
a
vid
Ag
u
ilar
g
i
t
-
mergetool--lib: Make vimdiff retain the
current
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
D
a
vid Aguilar
g
i
t: Remove h
a
ndling for GIT_PR
E
FIX
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
Dav
i
d Aguilar
setup
:
Pro
v
i
de GIT_PREFIX to bu
i
lt-ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
David Aguilar
su
b
module
s
ync: Upd
a
te "submodule
.
<nam
e
>
.
url"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-17
D
a
v
id Aguilar
mergetool: Skip autoresolved
p
a
ths
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
David Aguilar
Do
c
umentation:
E
x
p
la
i
n gi
t
-
m
ergetool's use of
te
m
p
o
ra
r
y
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-29
David Aguilar
M
a
k
efile: Re
m
ove
u
sage of
depr
e
cate
d
Python
"has
_
key
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-28
David
A
gui
l
ar
difftool: Fix '--gui' wh
e
n diff
.
g
u
itool is unconfigured
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-23
David Aguilar
t7800-difftool
.
sh: Test mergetool
.
prompt fal
l
b
a
c
k
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-16
Da
v
id Aguilar
difft
o
o
l
:
Up
d
ate copyright notic
e
s to lis
t
each year
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
Da
v
id Aguilar
difftool:
Use eval
t
o expand '--ex
t
c
m
d' expressions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
Dav
i
d Aguilar
difftool: Add '
-
x' and
a
s an alias for '--extcm
d
'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
Da
v
id Aguilar
t78
0
0
-difftool
.
sh:
S
i
m
p
lify the
-
-extcmd test
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
D
avi
d
Agu
i
l
a
r
git-diff
.
txt:
L
ink to
g
it-difftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguil
a
r
difftool: Al
l
ow
specifying unconfi
g
ure
d
commands with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David
A
gui
l
ar
difft
o
ol
-
-helper: Remove use o
f
the GIT_MERGE_TOOL
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Agui
l
ar
d
i
fftool--helper: Update copyri
g
ht and remove
d
istracting
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
D
avid Aguil
a
r
git-diff
t
o
ol: Add
'
-
-
g
ui' for sel
e
ctin
g
a GU
I
tool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
t780
0
-dif
f
tool:
S
et a bogus tool for use by tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
David Ag
u
ilar
he
l
p:
D
o not unnec
e
ssarily
l
o
ok
f
o
r a repo
s
itory
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
D
avid Aguilar
submodu
l
e
.
c: Sque
l
ch
a
"
use before assignment" warn
i
ng
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David
A
guilar
d
i
ff: g
e
nerate pretty
f
ile
n
a
m
es in prep_
t
emp_blob()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
Da
v
id Aguilar
compat:
add
a basen
a
m
e()
compatibi
l
ity function
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David
Aguil
a
r
co
m
pat
:
add a
m
kstemps() compatibili
t
y fun
c
tion
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
Da
v
i
d Aguila
r
Add g
i
t
-replace to
.
git
i
gnore
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
D
a
vid Ag
u
i
la
r
m
ergetool--l
i
b
: add
s
upport for ar
a
xis me
r
ge
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
David Aguilar
m
e
rgetool-
-
lib: spe
c
ialize diff
o
pt
i
ons f
o
r
e
mer
g
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
David
Aguilar
mergetool--li
b
:
simp
l
i
f
y API usage b
y
removing mo
r
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool/merge
t
ool: refacto
r
commands to use git-m
e
r
g
etoo
l
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguila
r
mergetoo
l
: use $(
.
.
.
) in
s
tea
d
of `b
a
ckticks`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid A
g
u
i
lar
bash completion: add gi
t
-difftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
ilar
d
i
ff
t
ool: add support f
o
r a difftool
.
prompt co
n
f
i
g
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguila
r
diffto
o
l
: add various gi
t
-difftool tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
d
i
f
ftoo
l
: move 'gi
t
-
d
i
fftool' out of con
t
rib
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David A
g
uila
r
difftool: add a -y
shortcut
f
or --no
-
p
rompt
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Agu
i
lar
difftool:
u
se p
e
rl
bu
i
l
t
-ins when testing for msys
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Aguilar
difftool: remove the b
a
c
k
up file feat
u
re
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
A
g
ui
l
ar
difftool:
remove merge opti
o
ns for opendiff
,
tkdiff
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-22
David Agui
l
ar
eve
r
yday:
use the d
a
s
h
l
e
ss form o
f
g
i
t-init
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-12
Davi
d
Aguilar
contrib/diffto
o
l: u
s
e a separate config namesp
a
ce for
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-01
David Aguilar
con
t
rib
/
difftool:
Don't repeat merge tool can
d
idates
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
difftool:
p
u
t the cu
r
so
r
on the editable fi
l
e for Vim
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
d
i
f
ftool: fix
do
c
ume
n
t
a
tion problems
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-18
Davi
d
Agu
i
lar
con
t
rib: add 'gi
t
difftool'
f
or l
a
u
n
chin
g
c
o
mmon merge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-12-20
Davi
d
A
g
ui
l
ar
git-mergetool:
pro
p
erly handle
"
gi
t
mer
g
e
tool --
filen
a
m
e
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-03
David
A
g
uilar
te
s
t
s
: add
a t
e
stcase fo
r
"git submod
u
le sy
n
c
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-26
David A
g
uil
a
r
g
i
t
-
s
u
bmodule
:
add "syn
c
"
command
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-23
D
avid Aguilar
git-submodule: replace duplic
a
ted code with a
m
odule_list
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-03-11
Dav
i
d
Aguilar
[PATCH] gitk: Don't sh
o
w local changes when
w
e
there
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree