repo.or.cz
/
git
/
debian.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
mergetools/p4merge: Handle "/dev/null"
2012-10-11
David Aguilar
m
e
r
g
etools/p4merge
:
Handle "/dev/null"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
David
A
g
u
ilar
g
itk: Ren
a
me 'tagconten
t
s'
to 'cached_tagcontent'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
D
a
vid Aguilar
gitk:
Teach "Reread references" t
o
r
e
l
o
a
d tag
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-03-19
Dav
i
d
Aguil
a
r
t
7800: Te
s
t difftool passing argum
e
nts
t
o diff
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-01-23
D
avid
Aguilar
merg
e
t
o
ol: Provi
d
e a
n
emp
t
y
file whe
n
needed
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-30
David Aguilar
Makef
i
le: Improve co
m
piler header depende
n
cy che
c
k
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
Davi
d
A
guilar
mergetools/mel
d
: Use
'
--output
'
when available
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
mergetool--lib: Refa
c
t
o
r tools in
t
o
se
p
a
r
at
e
fi
l
es
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Agui
l
ar
mergetool--lib: Make style co
n
si
s
te
n
t
with git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
Davi
d
A
guilar
d
i
fftool--he
l
per: Mak
e
style consistent
w
i
t
h git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-06-02
David Aguilar
t/t7503-pre-commit-hook
.
sh: Add GI
T
_PRE
F
IX tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
gi
t
-merg
e
t
o
ol--lib: Mak
e
v
i
mdiff reta
i
n the current
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
Dav
i
d Agui
l
ar
g
it:
R
emove handli
n
g
f
or GIT_PRE
F
IX
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
setup: Provide G
I
T_PRE
F
IX to
b
uil
t
-in
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
David Aguilar
submodule s
y
nc: U
p
date "s
u
b
mod
u
le
.
<name>
.
url"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-17
D
a
v
id
A
guilar
mer
g
eto
o
l
:
Skip a
u
toresolved pat
h
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
David Aguil
a
r
D
o
cu
m
e
nt
a
ti
o
n: Explain git-mergetool's
use of temp
o
rary
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-29
David Aguilar
M
a
k
ef
i
le: Remove u
s
age of d
e
precated
Python "has_k
e
y
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-28
David Aguilar
d
i
fftool: Fix '--gui' when diff
.
gu
i
tool is unco
n
f
igur
e
d
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-23
David Aguilar
t
7
8
00-diffto
o
l
.
sh: Test
mergetoo
l
.
promp
t
f
a
llback
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-16
Davi
d
Aguilar
difftool: U
p
date copyright notices to list each year
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Ag
u
ilar
d
i
fftool: Use eval
to
expand
'
--extcmd' expr
e
ssions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
D
avid Aguilar
difftool: Add '
-
x' and as an a
l
ias fo
r
'--extcmd
'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David
Agui
l
ar
t7
8
00-difftoo
l
.
sh
:
Simplify th
e
-
-extcmd test
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David
Aguilar
git-diff
.
t
x
t: Link to
git-
d
i
f
ftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
difftool: Allow specif
y
i
n
g unconfigured c
o
mman
d
s with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
di
f
ftool
-
-helper
:
R
emov
e
use
of the
G
I
T
_MER
G
E_TOOL
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Agu
i
lar
diff
t
ool--
h
e
l
per: Upd
a
te
copyr
i
ght
a
n
d remove di
s
t
r
acting
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
Dav
i
d
Aguilar
git-di
f
ft
o
ol: Add '--gui' for selec
t
ing a GUI too
l
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David Agui
l
ar
t
7800-difftool: Set a
b
ogus tool for
u
s
e
by tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
David
A
g
u
i
l
a
r
help: Do not unnecessa
r
ily lo
o
k
for
a repository
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
David Aguilar
submodule
.
c: Squelch a "u
s
e befor
e
assignment"
w
a
rni
n
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
diff: ge
n
erate pret
t
y filenames in pre
p
_temp_blob()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
D
avid Aguilar
compat
:
add
a
basename
(
) compatibility f
u
nction
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
compat
:
add a mkstemps() compa
t
ibility function
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Agu
i
lar
Add g
i
t
-
re
p
lace to
.
gitignore
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
David Aguila
r
mergetool--lib: add suppor
t
for araxis
merge
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
David
A
g
u
i
lar
mergeto
o
l--l
i
b
:
specialize diff options for
e
merge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
David Aguila
r
me
r
getoo
l
--lib: si
m
plif
y
A
P
I usage b
y
removi
n
g
m
ore
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftoo
l
/
mergetool: refactor comma
n
d
s
t
o use git-merg
e
tool
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
A
gui
l
ar
mergetool:
u
se $(
.
.
.
) instead o
f
`backticks`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David A
g
u
i
l
a
r
ba
s
h c
o
mple
t
ion: add git-difftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
A
guil
a
r
diffto
o
l: add support
for a difftool
.
p
rom
p
t con
f
ig
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid A
g
uilar
difftool: add v
a
rious
g
it-dif
f
to
o
l tes
t
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Aguil
a
r
difftool: m
o
ve 'gi
t
-difft
o
ol' out of contrib
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Aguilar
difftool: a
d
d a
-
y shortcu
t
for --no-
p
rompt
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: use perl bui
l
t-ins when testin
g
for msys
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
A
guilar
d
i
fftool: remove t
h
e backup file featu
r
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Aguil
a
r
difftool:
r
emov
e
m
erge op
t
ion
s
for ope
n
diff, tkdiff
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-22
Davi
d
Aguilar
everyda
y
:
u
se the dashless
f
o
rm of git-
i
nit
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-12
David Agu
i
l
ar
c
o
n
trib
/
diff
t
ool: use a
separate c
o
n
fig namespace for
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-01
Dav
i
d Aguilar
c
o
ntrib
/
difftool:
Don't repe
a
t
m
e
r
ge t
o
ol cand
i
dates
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David
A
guilar
diff
t
ool: put th
e
cursor
o
n the edit
a
b
le file for Vim
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David Ag
u
ilar
difftool: fix doc
u
mentation probl
e
ms
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-18
D
avid Agu
i
la
r
contrib: add
'
git difft
o
ol' for laun
c
hing common merg
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-12-20
David Ag
u
i
lar
git-me
r
getool
:
properly
handle "
g
it mergetool -- filename"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-03
Davi
d
Aguilar
tests:
a
dd a testc
a
s
e
for "git su
b
module sync"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-26
David Aguilar
git-submodule:
add "sync"
command
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-23
Davi
d
Aguilar
git-submodule: replace dupl
i
cated code wi
t
h
a
module_list
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-03-11
David Aguilar
[PATCH] gitk: Don't show local changes when we the
r
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree