repo.or.cz
/
git
/
mjg.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
difftool: Handle finding mergetools/ in a path with spaces
2012-07-25
David Aguil
a
r
dif
f
tool: Handle
finding mer
g
etool
s
/ in a path with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
D
av
i
d Ag
u
il
a
r
diff
t
ool:
Us
e
syml
i
nks
w
hen diffing against the work
t
ree
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David A
g
uilar
difftool: Call the temp directory "git-difftool"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Agu
i
la
r
difftool:
M
ove option
v
alues into a ha
s
h
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
D
a
v
id Aguilar
di
f
f
tool: Eliminate global
v
ariables
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Agu
i
lar
d
i
f
ftoo
l
: Simpli
f
y pr
i
nt_tool_help
(
)
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-03-19
David Aguil
a
r
t
7
8
0
0: Test d
i
ff
t
ool passi
n
g argume
n
ts to diff
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-01-23
D
a
v
id Aguilar
m
erge
t
ool: Pro
v
ide
a
n empty f
i
l
e
when
needed
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-30
David Aguil
a
r
Makefile: Improve com
p
il
e
r
h
eade
r
dependen
c
y
c
heck
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
mergetools/mel
d
: Use '-
-
outp
u
t' when availabl
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
m
ergetool--lib:
R
efactor t
o
ols into separa
t
e file
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
Da
v
id Agu
i
la
r
m
e
rgetool--lib
:
Make style consisten
t
w
i
t
h
git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
D
avid A
g
u
ilar
diff
t
ool--
h
e
l
per
:
M
a
k
e
style consistent w
i
th
git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-06-02
Da
v
id Agui
l
ar
t/t75
0
3-pr
e
-commit-hook
.
sh: Add G
I
T
_PREF
I
X tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
D
a
vid Aguilar
gi
t
-me
r
g
et
o
ol
-
-
lib: Make vimdiff retain th
e
c
u
rrent
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
git
:
Remove han
d
ling for GIT_PREFIX
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Aguila
r
s
et
u
p: P
r
o
vide G
I
T
_PREFIX to bu
i
lt-
i
ns
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
David
A
gu
i
lar
submodule sync: Update "sub
m
odule
.
<name>
.
u
r
l"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-17
David Aguilar
mer
g
etool: S
k
ip
a
utoresolved paths
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
David
Agu
i
lar
Do
c
u
m
entati
o
n: Explain git-m
e
rgetool's use
o
f
t
e
m
porary
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-29
Dav
i
d Aguilar
M
a
kefile:
Remove usage
o
f de
p
recated
Python "has_key
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-28
David Agui
l
ar
d
i
fftool: Fix '--gui' when diff
.
guitoo
l
i
s
u
nconfigured
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-23
David Aguilar
t780
0
-diff
t
ool
.
s
h
: Test
mergetool
.
prompt fallb
a
ck
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-16
David Aguilar
difft
o
ol:
U
p
d
ate copyright notice
s
to list each year
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Agu
i
l
ar
difftool: Us
e
e
v
al t
o
expa
n
d '--e
x
tcmd' e
x
pressions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David A
g
uil
a
r
difftool: Add '-x' a
n
d as an alias f
o
r
'
-
-
extcmd'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
D
a
v
id Aguilar
t7800-difftoo
l
.
sh:
Simp
l
ify the -
-
extcm
d
test
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David
Aguilar
git-
d
if
f
.
txt: Link
to git-difftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
d
ifft
o
ol: Allow spe
c
ifying unco
n
f
i
gured co
m
ma
n
ds with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Da
v
id
Aguilar
di
f
f
tool--
h
elpe
r
:
R
emov
e
use
of the GIT_MERGE_TOOL
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguil
a
r
difftool-
-
helper: Upda
t
e
c
o
p
y
r
i
ght and
r
emove dis
t
racting
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
D
avid Agu
i
lar
git-
d
ifftool: Add '--gu
i
'
for se
l
ecting a GUI tool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David A
g
u
ila
r
t
780
0
-difftool:
S
e
t
a bogus
t
ool for use
by tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
Da
v
id Ag
u
ilar
h
e
lp: Do
n
ot unneces
s
arily
l
ook for
a repository
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
D
a
vid Aguilar
su
b
mo
d
ule
.
c: Squelch
a
"u
s
e before
a
ss
i
gnm
e
nt" warning
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
Davi
d
Ag
u
i
l
a
r
dif
f
: generate
p
r
e
tty
f
ilenames in pr
e
p_temp_blob()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
co
m
p
a
t: add a b
a
s
ename
(
) compatibi
l
it
y
f
u
nc
t
ion
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Agui
l
ar
comp
a
t: add
a
mkstemps
(
) co
m
p
at
i
bility fu
n
ction
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
Add git-r
e
place to
.
g
i
tignore
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
David Aguilar
me
r
g
e
tool
-
-lib: add
s
up
p
ort for araxis merge
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
David Agui
l
ar
merget
o
ol--lib: spec
i
alize
dif
f
o
p
t
i
ons
f
or emerge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
David
Aguilar
mer
g
etool--lib: sim
p
lify API usage by removi
n
g
more
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id A
g
uilar
difftool/me
r
g
e
tool: refactor co
m
m
ands t
o
u
se git-mergetool
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
Aguil
a
r
merge
t
o
o
l
:
use $
(
.
.
.
) in
s
tead of `b
a
ckti
c
ks`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Aguilar
b
a
sh completion: add git-difftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
Aguilar
dif
f
to
o
l: ad
d
suppor
t
f
o
r a
diff
t
ool
.
prompt config
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Aguil
a
r
difftool: add
various git-di
f
ftool te
s
ts
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id
A
guil
a
r
dif
f
t
ool: move 'git-diffto
o
l
'
out of con
t
rib
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool:
a
dd a -y shortcut for --no
-
p
rompt
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Agu
i
lar
d
ifftoo
l
: use perl buil
t
-ins w
h
en tes
t
i
n
g
for msys
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David A
g
uilar
d
i
fftoo
l
:
r
emove the backup file f
e
a
ture
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David A
g
uilar
d
i
fftool: remove me
r
ge options f
o
r o
p
endiff, tkdiff
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-22
D
a
v
i
d
Aguilar
everyday:
use
t
h
e dashless form of git-init
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-12
David Aguil
a
r
c
o
n
t
rib/difftool: us
e
a separate
conf
i
g
namespace for
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-01
D
a
v
i
d Aguilar
contrib/difftool: Don't
r
epeat merge too
l
candidates
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
difftool: put the cursor o
n
t
he edi
t
abl
e
file for Vim
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
D
a
vid Aguilar
difft
o
ol:
f
i
x
document
a
tion prob
l
em
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-18
David Aguilar
con
t
rib: a
d
d 'git dif
f
tool'
f
or
l
aunching comm
o
n
merge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-12-20
David
Aguil
a
r
git-mergetoo
l
:
properly han
d
l
e "
g
it mergetool
-
- filename"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-03
David
A
g
uila
r
tests: ad
d
a
testcase
for "gi
t
subm
o
dule sync"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-26
David A
g
uilar
g
it-submodul
e
: add "sync
"
c
o
m
m
and
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-23
Dav
i
d Aguilar
git-subm
o
dule: replace dupli
c
ate
d
code
with a modul
e
_lis
t
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-03-11
Davi
d
Aguilar
[PATCH] g
i
t
k
: Don't show
l
oca
l
c
h
anges
w
hen we there
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree