repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
ls-tree $di $dir: do not mistakenly recurse into directories
2010-08-18
D
avid Agui
l
a
r
submodule sync: Update "su
b
module
.
<name>
.
url"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
David A
g
uilar
Do
c
u
m
entation: Explai
n
g
it-me
r
getool's use of t
e
mporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
D
a
vid Agui
l
ar
Make
f
il
e
: R
e
m
o
ve usa
g
e of de
p
recated
Pytho
n
"has_ke
y
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
David Aguila
r
difft
o
ol: Fix '
-
-gui' when diff
.
gui
t
ool i
s
unconfigured
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
David
A
guilar
t7800-difftool
.
sh:
Test mergetool
.
p
r
ompt fa
l
lback
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
David A
g
uilar
dif
f
t
o
ol: Update copyright
notic
e
s
to
list each year
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
Da
v
id Aguilar
difftool
:
Use eval to expan
d
'
-
-extcmd
'
exp
r
es
s
ions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
di
f
f
t
o
o
l
: Add
'
-x' a
n
d as a
n
alias
for '--ext
c
md'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David A
g
uila
r
t7800-difftoo
l
.
sh: Simplify the --extcmd
test
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
git-diff
.
tx
t
: Lin
k
to gi
t
-difftoo
l
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Davi
d
A
guilar
difft
o
ol
:
A
llow
specifyin
g
unconfigured commands with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David
Aguilar
diff
t
ool--helper:
Remove
u
se of the
G
IT_MER
G
E
_
TOOL
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Agui
l
ar
d
i
fft
o
ol-
-
h
e
lper: Up
d
ate copyrig
h
t a
n
d remov
e
distracting
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David
A
gu
i
la
r
git-difftool:
A
dd '--gui
'
for selectin
g
a
G
U
I tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David Agu
i
la
r
t780
0
-diff
t
ool: Set
a
bogus
tool for u
s
e by tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
David Aguilar
hel
p
: Do not unn
e
cessarily lo
o
k
for a rep
o
s
i
tory
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
David Aguilar
submodule
.
c: Squelch
a "use before
a
ssignment" warning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Ag
u
ila
r
diff: generate
p
re
t
ty filen
a
mes in prep_temp_b
l
ob()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguil
a
r
compat:
a
dd a
basen
a
me() compati
b
il
i
ty
function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Da
v
i
d Agui
l
ar
compat: a
d
d a mkstemps(
)
compatibility function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David
A
guilar
Add git-replace to
.
g
i
t
i
gnor
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
Da
v
id A
g
u
i
lar
merg
e
tool--l
i
b: ad
d
s
u
pp
o
rt for araxis merge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
David
Aguil
a
r
mergetool--l
i
b: specialize diff options fo
r
e
m
e
rge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
D
av
i
d Ag
u
i
l
ar
m
erge
t
ool--lib
:
simplify API usage
by removi
n
g mor
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
Agu
i
lar
difftoo
l
/
m
er
g
etool: refac
t
or commands to
u
se git-mergetool
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Aguilar
mergetool: u
s
e $(
.
.
.
) instead of `backtick
s
`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
bash co
m
ple
t
io
n
: ad
d
git-difftoo
l
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d
Aguilar
diffto
o
l: add support for a diff
t
ool
.
pr
o
mpt
c
onfig
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
dif
f
too
l
: add v
a
riou
s
gi
t
-difftool tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d
Aguilar
difftool: move 'git
-
difftool' out of contrib
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
v
i
d
Agu
i
l
a
r
diff
t
ool:
a
dd
a
-y shortcut for --no-prom
p
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: use
p
e
rl
b
ui
l
t-
i
ns when testing for msys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Aguilar
di
f
f
tool: remov
e
the ba
c
kup f
i
le f
e
ature
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
dif
f
t
o
ol:
r
emove merge options
for op
e
ndiff, tkdiff
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
D
avid Agu
i
lar
e
v
ery
d
ay:
use the dash
l
ess fo
r
m of git
-
i
n
it
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-12
David Aguilar
cont
r
i
b
/diff
t
oo
l
: use a separ
a
te config names
p
ace
f
or
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
David Aguil
a
r
con
t
r
i
b/difftool: Don't repeat merge tool candidates
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
D
avid Agu
i
l
ar
diff
t
ool:
p
ut the cursor on the
e
d
i
t
a
ble file
f
or Vim
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
di
f
f
t
ool: fix documenta
t
ion
p
r
o
b
l
ems
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-18
David
A
guilar
cont
r
ib
:
ad
d
'git
d
i
ff
t
ool' for
l
aunching
common merge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-12-20
David Ag
u
ilar
git-m
e
rg
e
too
l
: prope
r
ly h
a
n
dle "g
i
t merg
e
tool -- file
n
a
me
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-03
David Aguilar
te
s
ts: add
a
testcase for "git submo
d
ule sync"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-26
David Aguilar
g
it-subm
o
dul
e
:
a
dd "s
y
nc"
comma
n
d
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-23
D
a
vid Aguilar
git-s
u
bmodule:
r
eplace duplicated co
d
e with
a module
_
list
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-03-11
David
A
g
uilar
[PATCH] gi
t
k
:
Don't
show local changes when
w
e the
r
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree