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
Merge branch 'ab/maint-reset-mixed-w-pathspec-advice'
2010-08-17
David
A
g
uilar
mergetoo
l
:
S
kip autoresolved pa
t
hs
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
David
Aguila
r
Documentatio
n
:
Explain
g
it-merg
e
tool'
s
use
o
f tempo
r
ary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
David A
g
uilar
Mak
e
f
i
le: Remo
v
e usage of depre
c
ated Pytho
n
"
has_key
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
David Agui
l
ar
difftool: Fix '--
g
ui' when diff
.
guitool is unc
o
nf
i
gured
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
David Agu
i
lar
t
7
800-diff
t
ool
.
sh: Test mergetool
.
pro
m
p
t
f
a
llbac
k
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
David
Agu
i
lar
difftool: Update c
o
pyright
n
otices to l
i
st eac
h
year
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
D
a
v
i
d Aguilar
dif
f
t
o
o
l: Use eval to expan
d
'--extcmd' expressions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
Davi
d
Ag
u
i
l
ar
di
f
ft
o
ol: A
d
d
'-x' an
d
a
s an ali
a
s for '--ex
t
cmd'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
Dav
i
d Aguilar
t780
0
-
difftool
.
s
h
: S
i
mplify the --extcmd test
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Dav
i
d
Aguilar
git-diff
.
t
xt: Link
to git-difftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David
Agui
l
ar
d
if
f
tool: Allow specifying unc
o
nfigured commands with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
D
avid
Aguilar
di
f
ftool--helper: Remo
v
e
use of the GIT_MERGE_TO
O
L
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Da
v
id Agui
l
ar
difftool-
-
helper: Update
c
o
p
yright and rem
o
v
e
distractin
g
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
g
it-
d
iff
t
o
o
l
:
A
d
d '--gui' for selecting a GUI tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
D
a
vid
Aguila
r
t780
0
-difftoo
l
: S
e
t a bog
u
s tool for use by tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
Dav
i
d Aguilar
he
l
p: Do not unnecessarily look fo
r
a
re
p
osito
r
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
David Aguilar
s
ubmodule
.
c: Squelc
h
a "u
s
e before assignment"
w
arni
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Davi
d
Aguilar
d
i
f
f
:
g
enerate pretty filenames in prep_temp_blob()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
D
av
i
d Aguil
a
r
c
o
mpat: add a
basen
a
me() compatibility fun
c
t
ion
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
D
av
i
d Aguilar
compat:
a
dd a mkstemps() c
o
mpati
b
ilit
y
functi
o
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Da
v
i
d A
g
uilar
A
d
d git-replace t
o
.
gitignore
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
David Aguilar
mergetool--lib:
add su
p
por
t
f
o
r
a
raxis merge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
D
avid Aguilar
mergetool
-
-lib: specialize diff options for emerge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
Dav
i
d Aguilar
mergetoo
l
-
-lib: sim
p
li
f
y API usage by
r
emo
v
ing more
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Agui
l
ar
d
i
fftool/merget
o
ol: ref
a
c
tor commands t
o
use git-mergeto
o
l
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
v
i
d
Aguilar
mergetool: use
$
(
.
.
.
) instead of
`
b
a
ckticks`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Aguilar
bash c
o
mpleti
o
n
:
a
dd git-difftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Aguilar
difftool: ad
d
supp
o
rt for a di
f
ft
o
ol
.
pro
m
pt
c
onf
i
g
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difft
o
ol: add vario
u
s gi
t
-d
i
fftool test
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d A
g
uilar
difftool: move 'g
i
t-difftool' out
o
f
contrib
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
diffto
o
l:
a
dd a
-
y shortc
u
t fo
r
--no-prompt
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David A
g
uilar
difftool:
use perl built-i
n
s
when t
e
sti
n
g for msys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
A
guil
a
r
diffto
o
l: rem
o
ve the backup fil
e
feat
u
r
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Agu
i
lar
d
i
fftool: remove merge options for opendiff, t
k
diff
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
David Ag
u
ilar
everyday: use the dashless for
m
of git-init
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-12
Dav
i
d
Agui
l
ar
c
o
ntrib/
d
ifft
o
ol:
use a separ
a
t
e config n
a
mes
p
ace for
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
David A
g
uilar
con
t
rib/d
i
fftool: Don'
t
repeat merge too
l
c
a
ndid
a
tes
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
D
avid Ag
u
ilar
di
f
f
t
ool
:
put the cursor on
the e
d
ita
b
le
file for
V
i
m
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
difftool: fix d
o
cumentation probl
e
ms
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-18
Da
v
id Aguilar
contrib: add
'
git difftool' for
launch
i
ng commo
n
merge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-12-20
D
a
vid Aguilar
git
-
mer
g
etoo
l
: prop
e
rly ha
n
dl
e
"git mer
g
etool
--
f
ilename"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-03
D
avi
d
Agui
l
a
r
tests
:
add
a testcas
e
for "git sub
m
odule sync"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-26
David Agui
l
ar
g
i
t-submodule: a
d
d "s
y
nc" command
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-23
David Aguilar
g
i
t-submodule:
r
eplace
duplica
t
ed
c
o
d
e
with
a
module_
l
i
st
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-03-11
David Aguilar
[PATCH] gi
t
k: Don't show local changes
when w
e
th
e
re
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree