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
Documentation: Explain git-mergetool's use of temporary files
2010-07-19
David Ag
u
ilar
Documen
t
ation: Explai
n
g
i
t-mergetool's use o
f
t
e
m
p
orar
y
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-29
David Aguilar
Makef
i
le: Remov
e
usage
o
f deprecated Python
"has_key
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-28
D
a
vid Aguila
r
difftool: Fix
'
--gui'
whe
n
d
i
ff
.
guito
o
l is
u
nc
o
nfigu
r
e
d
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-23
D
avid Agu
i
lar
t7800
-
di
f
ftool
.
sh: Test
merg
e
tool
.
prompt fallback
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-16
D
a
vid A
g
uilar
diff
t
ool: Updat
e
copyrigh
t
no
t
ices to lis
t
each year
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
difftool: Use eva
l
to
e
xpand '--extcmd' expressions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
Davi
d
A
guila
r
difftool: Add '-x' and as an
alias fo
r
'-
-
extcmd'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
D
a
vid Aguil
a
r
t7800-diff
t
ool
.
sh: Simpli
f
y the --
e
xt
c
m
d test
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
D
a
vid Aguilar
git-diff
.
txt:
Li
n
k to git
-
difftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Da
v
id Aguilar
dif
f
tool: Allo
w
sp
e
cifying
u
nconfigured commands with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
dif
f
to
o
l--helpe
r
: R
e
mo
v
e
use of t
h
e GIT
_
MERGE_TOOL
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Ag
u
ila
r
dif
f
t
o
ol--
h
elp
e
r
:
Up
d
ate copyright and remove distr
a
cting
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
git
-
diffto
o
l:
A
dd '--gui'
f
or se
l
e
c
ti
n
g
a
G
UI
tool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
t
7800-difftool:
Set a b
o
gus
tool for
u
s
e
b
y
te
s
ts
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
David Aguilar
h
e
lp: Do not unnecessari
l
y
l
ook for a repository
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
David Aguilar
su
b
module
.
c:
Squelch a
"use befor
e
a
s
si
g
n
m
ent"
warn
i
ng
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguila
r
dif
f
: gener
a
te prett
y
filena
m
es
i
n prep_
t
em
p
_bl
o
b()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
compat: add
a basename() compatibili
t
y f
u
nction
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguil
a
r
com
p
at: add a m
k
st
e
mps() compatibilit
y
function
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
Dav
i
d
A
g
uilar
Add
g
it
-
r
ep
l
a
ce to
.
gitignore
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
Dav
i
d Aguilar
mergeto
o
l--li
b
:
a
dd support for ar
a
xi
s
merge
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
Davi
d
Aguilar
mergetool
-
-l
i
b: specialize diff options for emerge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
David Aguilar
mergetool--lib: simp
l
ify API usage by
remo
v
ing mo
r
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Agui
l
ar
difftool/mergetool: refac
t
or
c
o
mmands to use git-m
e
rgetool
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Agu
i
lar
m
e
rgetool: use
$
(
.
.
.
)
i
nstead of `backticks`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
b
ash comple
t
ion: add git-difftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Agui
l
ar
difftool: a
d
d support
for
a difftool
.
prom
p
t config
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
ilar
dif
f
tool:
a
dd various git-
d
ifftool tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Aguilar
difftool: move '
g
it
-
difft
o
ol' out of co
n
trib
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
ilar
di
f
ftool: add a -y shortcut fo
r
--no-prompt
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool
:
use perl built-ins
when
t
esti
n
g for msys
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
A
gui
l
ar
dif
f
tool: remo
v
e
the back
u
p file feature
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Agu
i
lar
difftool
:
remove merge option
s
for opendiff, tkdiff
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-22
D
a
vid
A
guilar
ev
e
ryday: use
the dashless f
o
r
m of git-init
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-12
David Ag
u
ilar
c
ontri
b
/difftool: use a separate confi
g
namespace for
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-01
David Agu
i
la
r
con
t
rib/difftool: Don't repeat merge
t
o
ol can
d
idates
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David Agu
i
lar
diff
t
ool
:
put
the cursor on the edita
b
le f
i
le for
V
im
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
D
a
v
id
A
guilar
di
f
f
t
ool: fi
x
documentation problems
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-18
David Aguilar
co
n
tri
b
:
add 'git di
f
f
t
ool' for
launc
h
ing
common
merge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-12-20
David Agui
l
ar
git-mer
g
e
tool:
p
ro
p
erly handle
"git mergetool -- f
i
lename"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-03
David
Aguilar
tests: add
a
t
e
stcas
e
for "gi
t
submodule sync"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-26
David Agu
i
lar
git-s
u
bmodule: ad
d
"s
y
nc" command
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-23
David Ag
u
i
l
a
r
gi
t
-
s
u
bmodule: replace duplicated code with a module_list
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-03-11
Dav
i
d Aguilar
[PATC
H
] gitk: Do
n
't sh
o
w local changes when we th
e
r
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree