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 'jk/prompt-fallback-to-tty' into maint
2012-01-23
David Aguil
a
r
mergetool: Provide
a
n empty file when
n
e
eded
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
Davi
d
A
guil
a
r
Makef
i
le: Improve comp
i
ler header depe
n
dency
c
heck
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
mergeto
o
ls/
m
el
d
:
U
s
e '-
-
outpu
t
'
when available
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
mergetool-
-
lib: Refactor tools into separate
fi
l
es
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David
Aguilar
merge
t
o
o
l--li
b
:
M
a
ke style consistent wit
h
git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
D
a
vid Aguilar
diffto
o
l--helper: Make style consistent
w
ith git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
David Aguilar
t/t7503-pre-com
m
i
t-hook
.
sh: Add GIT_PREF
I
X t
e
s
t
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Agu
i
lar
git-merge
t
ool
-
-lib:
M
a
k
e vimdiff retain the current
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
Davi
d
Agu
i
lar
gi
t
:
Rem
o
ve handlin
g
for
G
I
T_PREFIX
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
D
avid Aguilar
setup: Pr
o
vide
GIT_P
R
EFIX to built-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
David
Aguilar
s
ubmodule sync: U
p
date "
s
ubmodule
.
<
n
ame>
.
url
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-17
David Aguilar
mergetool: Skip autoresolved
p
aths
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
Da
v
id
A
guilar
D
o
cumentatio
n
: E
x
p
l
ai
n
git-mergetool's use of tem
p
orary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
David Aguilar
Makefile: Remove usage of deprecated Py
t
hon
"
has_key
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
David Aguilar
difftool: Fix
'--gui' when diff
.
guit
o
ol is u
n
conf
i
gure
d
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
Da
v
i
d
Aguil
a
r
t7800-d
i
fftool
.
sh: Test mergetool
.
promp
t
fallb
a
ck
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
D
a
vi
d
Agui
l
ar
diff
t
o
o
l: Update copyright notices to lis
t
each year
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
D
av
i
d A
g
uil
a
r
dif
f
t
ool: Use eval to
expa
n
d '--extcmd' expres
s
i
o
n
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
difftool: Add '-x' and
a
s an ali
a
s fo
r
'
--
e
xtcmd'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
Dav
i
d A
g
uila
r
t7800-d
i
fftool
.
sh: Simplify the
--extcmd test
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
D
avid Aguil
a
r
g
it-diff
.
txt
:
Link to git-difft
o
o
l
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Agu
i
l
ar
difftool: Allow specif
y
ing unconfigured c
o
mmands with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
d
i
f
ftool--
h
elper: Remove use of the GIT_MERG
E
_TOOL
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David
A
guilar
difftool--helper: Update co
p
yri
g
ht an
d
rem
o
ve
d
i
stracti
n
g
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
git-diffto
o
l: A
d
d
'--gu
i
' f
o
r select
i
ng a GUI tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David
A
gu
i
lar
t780
0
-difftool: Set a bogu
s
tool for us
e
b
y
t
e
sts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
David Aguilar
help:
D
o not u
n
necessa
r
ily
l
ook
f
or a repos
i
tor
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
David Aguilar
sub
m
odul
e
.
c
: Squelch
a
"use before assig
n
ment" war
n
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Da
v
id Aguilar
dif
f
: generate pret
t
y fi
l
enam
e
s in p
r
ep_temp_blob()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
D
avid
Aguilar
comp
a
t
: ad
d
a basen
a
m
e
(
)
c
o
m
pati
b
ility function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Da
v
id Aguilar
comp
a
t
: a
d
d a mkstem
p
s()
c
ompa
t
ibility f
u
nction
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
Ad
d
git-r
e
p
l
ace
t
o
.
gitignore
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
David Aguilar
merg
e
to
o
l--lib: add s
u
pp
o
rt
f
or araxi
s
merge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
David Aguilar
merg
e
tool--lib:
s
peciali
z
e diff
options for emerg
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
David
A
g
u
ilar
mergetoo
l
--lib: simplify API usage by removing more
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Agu
i
lar
difftool
/
mergetoo
l
:
r
efac
t
or c
o
mmands to
u
s
e git-mergetoo
l
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
avi
d
A
g
u
i
l
a
r
mergetool: use $(
.
.
.
)
instead of `backticks
`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguil
a
r
bash
completion:
a
dd git-difftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
di
f
ftool: add suppo
r
t for
a
difftoo
l
.
prompt c
o
nfig
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Aguilar
difft
o
ol: a
d
d vario
u
s git-diff
t
o
ol tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguil
a
r
diffto
o
l: mov
e
'git-difftool' out
o
f
contrib
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Aguilar
d
ifftoo
l
: add a -y shortcut fo
r
-
-
no
-
prompt
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Aguilar
difftool:
use perl buil
t
-ins
wh
e
n
testing
for msys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguila
r
difftool: rem
o
ve t
h
e backup file feature
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
Aguilar
di
f
f
tool: remove
m
erg
e
options for op
e
n
diff, tk
d
iff
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
David Agu
i
l
a
r
ever
y
day: use the dashles
s
form
of git
-
in
i
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-12
David Aguilar
co
n
trib/dif
f
to
o
l
: use a
s
eparat
e
c
onfig namespace
for
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
D
a
vid
Aguilar
contrib/diff
t
oo
l
: D
o
n't repe
a
t mer
g
e tool candi
d
a
te
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David Aguil
a
r
difftool: put the cursor
on the editable file for Vim
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
d
i
fftoo
l
:
f
ix
d
ocumentation
p
robl
e
ms
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-18
David Aguilar
contri
b
: add 'git diffto
o
l
' for l
a
unch
i
ng common
m
erg
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-12-20
Da
v
id A
g
uilar
git-merge
t
ool: p
r
op
e
rly
han
d
le "
g
i
t mergetool
-
-
filen
a
me"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-03
D
a
vi
d
Aguilar
tests: add
a
testcase
fo
r
"
git submod
u
le syn
c
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-26
Davi
d
A
g
u
i
l
ar
git-submodule: a
d
d "sync" com
m
a
nd
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-23
David Aguil
a
r
git-sub
m
odule: re
p
lace duplicated code wi
t
h a module_list
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-03-11
David
A
guilar
[PATC
H
]
g
it
k
: Don't sho
w
local changes when w
e
th
e
re
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree