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
Git 1.7.9.1
2012-01-23
Dav
i
d Agui
l
ar
mergeto
o
l:
P
r
ovide an
empty
file w
h
e
n
needed
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
D
a
v
i
d Aguilar
Mak
e
file: Im
p
rove compiler h
e
ader de
p
endency check
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Da
v
id Aguilar
mergetools/meld: Use '--outpu
t
' when availa
b
le
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
merg
e
tool--lib: Refactor t
o
ols into sepa
r
at
e
files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguil
a
r
mergetool-
-
lib
:
Make style consis
t
ent wit
h
git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
difftool--
h
elper: Make
s
t
y
le consistent with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
David Ag
u
ilar
t/t7503-pre-commit-hook
.
sh: Add GIT_PREFIX tes
t
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
D
a
v
i
d
Aguilar
git-mergetool-
-
lib: Make vimdi
f
f retain the current
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
git: Remove
handling for GIT_PREFIX
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Ag
u
ila
r
s
etup: Provide
GIT_PR
E
FIX to built-
i
n
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
D
av
i
d
A
guilar
su
b
module sync: Update "s
u
bmodule
.
<name>
.
url"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-17
David A
g
uilar
m
e
r
g
et
o
ol: Skip autoresolved paths
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
David Aguil
a
r
Docum
e
ntat
i
on:
Ex
p
l
a
in git
-
m
e
rgeto
o
l's use of
t
e
m
p
o
r
a
r
y
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
D
a
vid
Aguila
r
M
akefile: Remove usage of deprecated Python "has_key
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
David Aguilar
diffto
o
l: Fix '
-
-gui' when
diff
.
guitool is unconfi
g
u
r
ed
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
David
A
guila
r
t7800-diffto
o
l
.
s
h: Test
m
e
r
g
eto
o
l
.
promp
t
fa
l
lback
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
David Ag
u
ila
r
d
if
f
tool: Upda
t
e copy
r
ight notices to lis
t
each year
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
difft
o
ol: Use e
v
al to e
x
pand '--extcmd' ex
p
ressions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguila
r
dif
f
tool: Add '-x' and as an ali
a
s for '--extcmd'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
t78
0
0
-
diff
t
ool
.
sh: S
i
mpli
f
y the --extc
m
d test
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Ag
u
i
l
a
r
git-di
f
f
.
txt: Link to g
i
t-diffto
o
l
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Dav
i
d
A
g
uil
a
r
difftool: Allow sp
e
c
i
fying unconfigured
c
ommands with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
d
ifft
o
ol--helper:
Remove use of the
G
IT
_
MERG
E
_TOOL
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David A
g
uil
a
r
di
f
f
t
ool--helper: Update copyri
g
h
t
and remove dist
r
acting
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
D
a
vid Aguila
r
git-diff
t
ool: Add '-
-
gui' for selec
t
ing a
GUI tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
D
a
vid Aguilar
t7800-difftool: Se
t
a bogus tool for use by t
e
sts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
David Aguilar
help:
D
o not unne
c
essarily look for a re
p
o
si
t
ory
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
David Aguilar
s
u
bmodule
.
c
:
Squelch
a
"use before assign
m
ent"
w
arning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Da
v
id Aguilar
d
iff: generate pretty
filenames
i
n prep
_
temp_blob()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
compat: a
d
d a basename() compatibil
i
ty function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
compat: add a mks
t
emps() c
o
mpatibility f
u
nction
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
A
d
d git-repl
a
ce to
.
giti
g
n
o
re
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
David
A
guilar
mergetool--lib:
a
dd su
p
p
or
t
for ar
a
xi
s
merge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
D
a
vid A
g
uilar
mergetool--lib
:
specializ
e
diff option
s
f
o
r emerg
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
David Aguil
a
r
mergetool-
-
lib: simplify API usage by
rem
o
ving more
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
ilar
difftool/me
r
getool: r
e
factor comman
d
s to
us
e
git-mergetool
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
mer
g
etool: use $(
.
.
.
) i
n
s
te
a
d of `ba
c
k
ticks`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Aguilar
bas
h
co
m
pl
e
tion: add git-difftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
Aguilar
di
f
ft
o
ol: add supp
o
rt f
o
r
a
difftool
.
prompt config
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David A
g
uila
r
d
i
fftool: add various git-dif
f
t
o
ol
t
ests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Aguilar
difftool: mo
v
e 'gi
t
-difftool'
o
u
t of co
n
trib
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Aguilar
diff
t
ool: add a -y shortcut for --no-pr
o
mpt
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Aguila
r
d
if
f
too
l
: use p
e
rl built-ins when testing for msy
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
i
d
Aguil
a
r
diff
t
ool:
remove the backup file
feature
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Aguilar
difftool:
remove me
r
ge o
p
tions for ope
n
diff, tkd
i
ff
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
David Aguilar
e
v
eryd
a
y: us
e
the dashless form of gi
t
-
ini
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-12
David Aguilar
contrib/
d
ifftool: use a separate c
o
n
fig namespac
e
for
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
David
Aguilar
cont
r
i
b
/diffto
o
l
: Don't re
p
eat merge tool ca
n
di
d
a
tes
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David Agui
l
a
r
difftool: put the cursor on the editable fi
l
e fo
r
Vim
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David Ag
u
ilar
dif
f
to
o
l: fix d
o
cum
e
ntation pr
o
blem
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-18
David Aguil
a
r
c
ontrib:
a
d
d
'git
difftool' for lau
n
ching
common mer
g
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-12-20
David Aguilar
git-mergetool:
properly handle "git m
e
rgetoo
l
-- fi
l
ename"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-03
Dav
i
d
Ag
u
ilar
tes
t
s
:
a
dd a t
e
stcase for "git sub
m
odule
sync"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-26
David Aguilar
git-submodule: add "sync"
c
ommand
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-23
David Aguila
r
git-
s
ub
m
od
u
l
e: replace
d
upli
c
a
t
ed code w
i
th a m
o
d
u
le_list
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-03-11
Da
v
id Aguilar
[PATCH
]
g
i
tk: Don'
t
sh
o
w local changes when we
t
here
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree