repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Makefile: Make dependency directory creation less noisy
2010-01-23
D
avid Aguilar
t78
0
0-d
i
fft
o
ol
.
sh
:
Test mer
g
et
o
ol
.
p
rompt fall
b
ack
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
David Ag
u
ila
r
di
f
ftool:
U
p
date copyr
i
ght notice
s
to list each yea
r
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Agu
i
lar
difftool: Use
e
val to ex
p
and '-
-
extcmd' expressions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
D
a
v
id Aguilar
difftool: Add '
-
x' and as an alias
f
o
r '--
e
xt
c
m
d
'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
t7800-d
i
fftool
.
sh: Simpli
f
y the
-
-extcmd test
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
D
avid Aguilar
git-diff
.
t
xt: Lin
k
t
o git-difftoo
l
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David A
g
ui
l
a
r
difftool:
A
l
low specifying
unconf
i
g
u
red co
m
m
a
n
ds with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
D
a
vid Aguil
a
r
difftool--help
e
r: Remo
v
e use of t
h
e GIT_MERG
E
_TO
O
L
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Ag
u
ilar
dif
f
tool
-
-
h
elper: Update copyrig
h
t
and remove
distra
c
t
ing
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
D
a
vid Aguil
a
r
git
-
difftool: Add '--gui'
f
or selecting a GUI tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David
A
g
u
ila
r
t7
8
0
0-d
i
fftool: Set a bogus tool for
u
se by tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
David Aguilar
help
:
D
o
not unnecessarily l
o
ok
for a repo
s
itory
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
Da
v
id Aguil
a
r
subm
o
dule
.
c: Squelch a "use
b
e
fo
r
e
a
ssignmen
t
"
warning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Davi
d
Aguilar
diff: genera
t
e
p
r
etty filenames in prep_temp_blob()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Dav
i
d
Aguilar
c
o
m
pa
t
: add a bas
e
name() compat
i
bil
i
ty func
t
ion
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
D
avid
Agu
i
lar
c
ompat:
a
d
d a mkstemps(
)
c
o
mpatibility
f
unction
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
Add
g
i
t-r
e
p
l
ace to
.
gitignor
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
David Aguilar
m
er
g
e
t
ool
-
-
li
b
:
a
d
d
s
u
ppo
r
t
for araxis merge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
D
avi
d
Agui
l
ar
mer
g
et
o
o
l--lib: specialize diff options f
o
r
em
e
rge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
D
a
v
i
d Aguilar
mergetool--lib: simplify API usa
g
e by remov
i
n
g
more
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d A
g
uilar
difftool/mergetool: refactor commands to use git-me
r
get
o
ol
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David A
g
uilar
m
er
g
etool: use $(
.
.
.
)
instead of `backticks`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Aguilar
bash completion: add git
-
difftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Agui
l
ar
difftool: ad
d
suppor
t
for a diffto
o
l
.
prompt config
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id
A
guilar
difftool:
add vario
u
s git-dif
f
tool tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: move 'git-difftool' out of
c
ontrib
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: add a -y short
c
ut for --no
-
p
rompt
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vi
d
A
guil
a
r
difftool: use
perl
b
uilt
-
i
n
s
w
hen
t
es
t
in
g
for
m
sys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
d
ifftoo
l
: remove the backup fi
l
e
f
eature
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Aguilar
difftoo
l
:
remove mer
g
e op
t
ions for opendi
f
f,
tk
d
iff
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
David Aguilar
ever
y
day:
use the dashless form
o
f
git
-
init
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-12
David Aguilar
contrib/di
f
ftool: us
e
a separate config
namespace for
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
David
A
g
uilar
contrib/d
i
fftool: Don't repe
a
t merge tool
c
andid
a
tes
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
Da
v
i
d Aguilar
d
i
fftool: put
t
he cu
r
sor on t
h
e editable
file f
o
r
V
i
m
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
dif
f
tool:
f
i
x documentation pro
b
lems
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-18
David Agui
l
ar
contri
b
: add 'git difft
o
ol'
fo
r
launching commo
n
merge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-12-20
Da
v
id Aguilar
g
i
t-m
e
r
g
et
o
ol:
p
roper
l
y handle "git mergetool -- fil
e
name"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-03
David Agu
i
lar
tests: add a
testcase for "git submo
d
ule sync"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-26
David Agui
l
ar
git-submo
d
ule: add
"
s
yn
c
"
command
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-23
D
a
vid A
g
uilar
gi
t
-submodule: replace duplica
t
ed
c
ode with
a
module_
l
ist
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-03-11
David Aguilar
[PATCH] gitk: D
o
n't sho
w
local changes when we
t
here
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree