repo.or.cz
/
alt-git.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 Agui
l
ar
difftool:
H
a
n
dle findi
n
g merg
e
tools/ in
a
p
a
th with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David A
g
uilar
diff
t
o
ol: Use sym
l
in
k
s
when diffing
against th
e
wor
k
tree
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
Dav
i
d Aguilar
d
i
fftool:
Call the temp directo
r
y "git-difftool"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
Da
v
id Aguilar
difftool: Move option
v
alues i
n
t
o
a hash
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
Da
v
id Aguilar
difftool: Elimi
n
ate glob
a
l vari
a
bles
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
D
a
vid Aguilar
difftool: Simplify
p
rint_tool_he
l
p()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-03-19
David Aguil
a
r
t780
0
:
Test
d
i
f
fto
o
l passing arguments to dif
f
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-01-23
David Aguilar
mergeto
o
l
: Pr
o
v
ide an empty file whe
n
needed
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-30
David
A
guil
a
r
M
ake
f
i
le:
Improve
c
ompile
r
header de
p
end
e
n
cy check
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David
Aguilar
mergetools/meld: Use '--output' whe
n
ava
i
lable
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
mer
g
e
t
ool--lib: Refactor tools into
s
ep
a
rate files
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David
Aguilar
merget
o
o
l
--lib: Make
s
tyle co
n
s
istent
with git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
Dav
i
d Aguilar
difftool--helper: Make style c
o
nsi
s
ten
t
with g
i
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-06-02
Davi
d
Aguilar
t/t750
3
-pre-commit-hook
.
sh
:
Add
G
IT
_
PREFIX tes
t
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
gi
t
-
m
erget
o
ol--lib: Ma
k
e vimdiff retai
n
th
e
current
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David A
g
u
i
lar
git: Remove handli
n
g for GIT_PREFIX
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
Da
v
id Aguilar
setup
:
Provide GIT_P
R
E
FIX to
bu
i
lt-ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Da
v
id
A
guil
a
r
sub
m
odule sy
n
c: Update "submodule
.
<nam
e
>
.
url"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-17
Dav
i
d Agui
l
a
r
mer
g
etoo
l
: Skip autoresolved
paths
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
David Aguilar
Doc
u
m
e
nt
a
tion: Explain git-m
e
rgetool's use
o
f t
e
mporary
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-29
David
Aguilar
Makefile:
R
e
mov
e
u
s
age of
d
eprecated Pytho
n
"has_key
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-28
Da
v
i
d
A
g
uila
r
di
f
ft
o
ol: Fix '--gui' when diff
.
g
u
itool is
unconfig
u
red
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-23
Davi
d
Aguilar
t7800-d
i
fftool
.
s
h
: Test mergetool
.
prompt fallba
c
k
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-16
David
Agu
i
l
ar
difftool: Update cop
y
right
notices t
o
list each
y
ear
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
D
a
vid A
g
u
ilar
diff
t
ool: Use ev
a
l t
o
expand
'
--e
x
tcmd' expre
s
sions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David
Aguilar
diff
t
oo
l
:
A
d
d
'-x' and as an alias
for
'--extcmd
'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Agu
i
l
a
r
t78
0
0-difftool
.
sh:
S
implify the --extc
m
d test
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
D
a
vid Agu
i
lar
git-d
i
ff
.
txt: Link to g
i
t-difftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
difftool: Allow spe
c
if
y
in
g
unconfigured comma
n
ds
w
ith
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
difftool
-
-helper: Remove use of t
h
e GIT_M
E
RGE_TOOL
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
difftool-
-
helper: Update copyright and remove dist
r
acting
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
D
a
vid Agui
l
a
r
git
-
difftool: Add
'
--g
u
i'
for
s
electin
g
a G
U
I tool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
t7800-difftool: Set a
b
ogus
t
ool fo
r
us
e
by te
s
ts
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
Dav
i
d Aguila
r
h
e
lp: Do not unnecessa
r
ily loo
k
f
or a r
e
pository
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
David Aguilar
sub
m
od
u
le
.
c: S
q
uelch
a
"use
before assignment" warning
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguil
a
r
d
iff:
generat
e
pretty f
i
l
e
names in prep
_
te
m
p_blo
b
()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
com
p
at: ad
d
a basenam
e
() com
p
atibility functi
o
n
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
c
o
m
p
at: add a mkstemps() compa
t
ibility functio
n
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
Ad
d
git-re
p
lace
to
.
gitignore
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
Dav
i
d
A
gui
l
ar
mergeto
o
l
--lib: add support for ar
a
xis merge
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
Dav
i
d
A
gui
l
ar
m
e
r
ge
t
ool--
l
ib: specia
l
ize di
f
f
opt
i
ons for emerge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
David Agu
i
l
a
r
mergetool--l
i
b: simplify API usag
e
by removing
more
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Ag
u
ilar
difftool/mergetool: refactor commands to use git-mergetool
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
Agu
i
lar
mergetool: u
s
e $(
.
.
.
) instead
o
f `backticks`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David A
g
uilar
bash comp
l
etio
n
: add git-diff
t
oo
l
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Aguilar
difftool: a
d
d suppor
t
for a difftool
.
pr
o
mpt c
o
nfig
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
v
i
d Aguilar
difftool
:
add
vari
o
us
g
it-d
i
f
ftool te
s
ts
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Agui
l
ar
difftool: move
'
g
i
t
-d
i
fftool'
o
u
t of
c
ontrib
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Aguilar
difftool: add a -
y
s
hortcut for --no-promp
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Aguilar
d
i
fftool: use
p
erl bu
i
l
t-i
n
s w
h
en t
e
stin
g
for msys
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David A
g
uilar
difftool: remov
e
the backup file featu
r
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
ilar
difftool: remove merge options fo
r
opend
i
ff, tk
d
i
ff
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-22
David Aguila
r
everyday:
use the dashless
form of git-
i
nit
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-12
D
a
vi
d
Aguilar
con
t
rib/difftool: use a
separate co
n
f
i
g
namespa
c
e
f
o
r
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-01
David
Aguilar
contrib/difftool
:
Don't repeat merge
t
ool candi
d
ates
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David
Aguila
r
diffto
o
l:
put t
h
e
curs
o
r on the editable file f
o
r Vim
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David
A
guilar
di
f
ft
o
ol:
f
i
x do
c
umentation
problems
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-18
David Aguilar
contrib: add 'git di
f
ftool'
for
launc
h
ing common
m
er
g
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-12-20
David Agu
i
lar
g
i
t-me
r
getool: properly h
a
ndle "
g
it
m
ergetool
-- filename"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-03
David Agu
i
lar
tes
t
s: add a testcase for "git submodule sync"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-26
David Aguil
a
r
git-sub
m
odule: add "sync" command
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-23
Davi
d
Aguilar
git-submodule: replace d
u
pl
i
c
a
ted code w
i
t
h a
modu
l
e_list
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-03-11
D
avid
Aguilar
[
PA
T
CH
]
gi
t
k: Do
n
't show
l
ocal
c
h
anges when we there
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree