repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Git 1.7.0.8
2010-03-29
Dav
i
d
A
g
u
i
l
a
r
Makefile:
Rem
o
ve usage of deprecated Python "has_key
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
D
avid Agui
l
a
r
difft
o
o
l
: F
i
x '-
-
gu
i
' when diff
.
guitool i
s
unconfi
g
u
r
e
d
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
D
avid Aguilar
t7800-di
f
f
t
ool
.
sh: Test mer
g
eto
o
l
.
pro
m
p
t
fall
b
a
ck
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
David Aguilar
difftool: Upd
a
te copyright no
t
ices to
l
ist ea
c
h year
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
Dav
i
d Ag
u
ilar
d
ifftool: Use e
v
al to expand '--extcmd' exp
r
essions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
d
iffto
o
l: Add
'
-x'
a
nd
a
s
an alias for
'--extc
m
d'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David
Aguilar
t7
8
00-d
i
fftool
.
sh
:
Simpl
i
fy the --extcmd
t
es
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
g
i
t
-di
f
f
.
txt: Li
n
k to gi
t
-diff
t
o
o
l
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David
A
guilar
di
f
ft
o
o
l:
Allow spe
c
if
y
ing unconfigu
r
ed co
m
m
an
d
s
with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David
A
guilar
difftool--helper:
Remove us
e
of the GIT_MERGE_TOOL
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguil
a
r
d
ifftool--helper: U
p
d
a
t
e cop
y
right and remove distract
i
ng
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
Da
v
id Ag
u
ilar
git-difftool: Add '--gui'
f
or
s
elec
t
i
ng a G
U
I to
o
l
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
t
7
800-difftool: Set a bogus
t
ool for us
e
by tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
David Aguilar
h
el
p
: Do not
u
n
n
ecessa
r
i
l
y l
o
ok
f
or a r
e
p
osit
o
ry
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
David
A
g
uilar
subm
o
dule
.
c:
S
qu
e
lch a "use before a
s
signment" warning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
di
f
f: generate pret
t
y f
i
le
n
ames in prep_te
m
p_blob(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Davi
d
Aguil
a
r
compat: add a basename()
compatibility function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Davi
d
Aguilar
co
m
pat: a
d
d
a mk
s
temps()
comp
a
tibility
f
u
nction
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
Add
g
it-replace
to
.
g
itignore
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
Da
v
i
d
Aguilar
merget
o
ol--
l
ib: a
d
d support for araxis mer
g
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
David Agui
l
ar
mergetool--lib:
specialize diff
o
ptions for emerge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
Davi
d
Ag
u
ilar
mergetool--lib: si
m
pli
f
y API usage by removing mor
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
v
id Agui
l
ar
difftool/mergetool: refactor commands
t
o use git-m
e
rge
t
o
o
l
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Agu
i
lar
mergeto
o
l: use $(
.
.
.
)
instea
d
of `backticks`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
bash co
m
pletio
n
: add git-difft
o
ol
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David A
g
ui
l
ar
d
i
ffto
o
l:
a
dd support for
a
difftool
.
pro
m
p
t config
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Agu
i
lar
dif
f
to
o
l: add various git-diff
t
oo
l
tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Agu
i
lar
difftoo
l
: m
o
ve
'git-diff
t
ool'
out of contr
i
b
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Agui
l
ar
d
i
ff
t
ool:
a
dd a -y sho
r
tc
u
t for --no-p
r
om
p
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
dif
f
tool:
u
se perl built
-
ins when testing
f
o
r msys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Aguilar
d
i
ff
t
ool: remove
t
he backup file feature
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id A
g
uilar
diff
t
ool: remove merge options for
o
pendiff, tk
d
iff
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
David
Agu
i
lar
ev
e
ryday: us
e
the dash
l
ess form of git
-
i
nit
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-12
David
Aguilar
contri
b
/difftool: us
e
a separate con
f
ig nam
e
s
p
ace for
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
Davi
d
Aguilar
co
n
trib/
d
if
f
tool: Don't repeat merge tool candidates
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David
Aguilar
di
f
ftool: put
t
he curs
o
r on the editable
f
ile
f
or
V
im
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David
A
guilar
diff
t
ool:
fix
documentation pro
b
lems
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-18
Da
v
i
d
Aguilar
c
ontr
i
b: add 'git difftool' for laun
c
hing
common merge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-12-20
David A
g
uilar
git-merget
o
ol: properly handle "git
merg
e
tool -
-
filename"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-03
David Aguilar
tes
t
s: ad
d
a testcase f
o
r
"
g
it submo
d
ule
s
ync"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-26
David Aguilar
gi
t
-submodule: add
"
syn
c
" com
m
an
d
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-23
D
a
vid Aguilar
git-s
u
bmodule: replace du
p
licated code with a mod
u
le_list
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-03-11
David Aguila
r
[PATCH] gitk: Don't
s
how l
o
ca
l
changes when we
t
here
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree