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
mergetools/p4merge: Handle "/dev/null"
2012-10-11
D
avid Agui
l
ar
merge
t
o
o
ls/p4merg
e
: Handle "/dev/n
u
ll"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
David Ag
u
i
l
a
r
git
k
: Rename 'tag
c
ontents' to 'cached_
t
agcontent'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
David
A
guilar
g
itk: Tea
c
h
"
R
erea
d
refere
n
ces" to relo
a
d tags
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-03-19
David
A
g
u
ilar
t7800: Test difftool passin
g
argument
s
t
o diff
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-01-23
David Aguilar
mergetool: Provide an empty
file when needed
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-30
Dav
i
d
A
g
u
ilar
M
akefile: Improve
com
p
ile
r
h
e
ader dependency check
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David
A
gu
i
lar
mergetools/
m
eld
:
U
s
e '--output
'
whe
n
availabl
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
merge
t
ool
-
-lib: Refactor to
o
ls into separat
e
files
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
Da
v
id
Aguil
a
r
mer
g
etool--lib: Ma
k
e style con
s
istent wi
t
h git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David
Aguilar
dif
f
tool--helper: M
a
k
e
style co
n
sistent
w
ith git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-06-02
David
Ag
u
ilar
t
/t7503-pre-commit
-
hook
.
s
h
: Add
G
I
T
_
PRE
F
I
X
tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
D
avid Aguilar
git-me
r
getool--
l
ib
:
Make vimdiff retain th
e
current
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David
A
guilar
git: Remove ha
n
dlin
g
f
o
r GIT_PREFIX
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
setup: Provi
d
e GIT_PR
E
FIX to
b
uilt-ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Dav
i
d Aguilar
submodu
l
e sync: Update "s
u
bmo
d
ule
.
<na
m
e>
.
url
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-17
Dav
i
d
Aguil
a
r
mergetoo
l
: Sk
i
p
a
uto
r
esolved paths
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
David Aguilar
Documentation: Explain git-mer
g
etool'
s
use
o
f
temp
o
r
a
ry
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-29
David Agu
i
lar
M
akefile: Remove usag
e
of
d
epr
e
cated Python "has_key
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-28
David
Aguilar
difftool: Fix
'
-
-
gui' when
diff
.
g
uit
o
o
l
is
un
c
on
f
i
g
ured
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-23
Dav
i
d Aguilar
t
7
800-dif
f
tool
.
s
h: Test merget
o
ol
.
prompt fallback
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-16
Davi
d
Aguila
r
difftool: Update copy
r
i
ght notice
s
t
o
list each year
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David A
g
uilar
difftool: Use
eval to expand '--
e
x
tcmd' e
x
pressions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Ag
u
i
l
ar
diff
t
ool: Add '-
x
' and as an alias for '--
e
xtcmd'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
t7800-difftool
.
sh: Simplify the --extcm
d
test
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Ag
u
ilar
g
i
t
-
diff
.
t
x
t:
L
ink to g
i
t
-
difftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Dav
i
d
A
g
uilar
difftool: Al
l
ow s
p
ecifyin
g
unconfigured com
m
ands with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
D
avid Ag
u
ilar
difftool-
-
helper: Remove use of the GIT
_
MERGE_TOOL
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Dav
i
d
Aguila
r
difftool--helper: Update cop
y
right and remove
d
istr
a
cting
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
git-difft
o
ol: Add '--gui' for selecting a
G
UI
tool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
Da
v
id Aguilar
t7800-di
f
ftool:
Set a bogus to
o
l
for us
e
b
y
test
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
David Aguilar
help: Do not un
n
e
c
es
s
a
r
ily look
for a repos
i
t
o
ry
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
David A
g
uilar
submodule
.
c:
S
q
uelch
a
"
u
se before as
s
ignmen
t
" warning
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
D
a
vid Ag
u
ilar
diff: generate pretty fi
l
enames
i
n prep_
t
emp_blob()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
c
ompat: add
a b
a
sename()
compatibilit
y
f
u
nc
t
ion
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
compat: add
a
mkstemp
s
(
)
com
p
atibility
function
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David
A
g
ui
l
ar
A
dd
g
i
t
-repl
a
c
e
to
.
gitign
o
re
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
David Ag
u
ilar
me
r
getool--lib
:
a
d
d
support
for araxis merge
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
David Agu
i
lar
mergetool--l
i
b:
s
pecialize d
i
ff
options for emerge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
Dav
i
d Agu
i
lar
mergetool--lib:
simplify
A
P
I usa
g
e
by
removing more
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
d
i
f
ftool/mergetool:
refactor co
m
mands to u
s
e
g
it-mergetool
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Aguilar
mergetool
:
use $(
.
.
.
) instead o
f
`backticks`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
v
i
d Aguilar
b
a
sh completi
o
n: ad
d
git
-
difftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
il
a
r
difftool: add supp
o
rt
f
or a difftool
.
prompt config
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
dif
f
to
o
l: add
va
r
i
ou
s
git-diff
t
o
o
l tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Aguilar
di
f
ftool: move 'git-di
f
ftool'
out
of contrib
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Agu
i
l
a
r
difftool:
add
a -y shortcu
t
fo
r
--no-prompt
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
Aguilar
di
f
ftool: use p
e
rl b
u
ilt
-
ins when testin
g
f
or msys
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
dif
f
t
o
ol: remove
the backup fil
e
fe
a
ture
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool
:
rem
o
ve merge options for op
e
ndi
f
f,
t
kd
i
ff
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-22
David Ag
u
il
a
r
everyday:
u
se
the
d
ashless form of git-init
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-12
David Aguilar
co
n
trib/difft
o
ol: use a separate config namespace for
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-01
David Aguilar
contrib/d
i
f
ftool:
Don't repeat merge tool candidates
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
Davi
d
A
g
uilar
difft
o
ol
:
pu
t
t
he cursor on the editable file f
o
r Vim
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David Agu
i
lar
di
f
f
t
ool: f
i
x doc
u
mentation p
r
oblems
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-18
Davi
d
Aguilar
contrib: ad
d
'git diffto
o
l' for
l
aunc
h
ing com
m
on merge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-12-20
David Aguilar
git-mergetool: pr
o
perly handle "git merge
t
ool -- filename"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-03
David Aguilar
tests: ad
d
a t
e
stcase for "gi
t
submodule sy
n
c"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-26
Da
v
id Aguilar
g
it-su
b
module
:
ad
d
"sync" comm
a
nd
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-23
D
avid Aguilar
git-sub
m
odule
:
replace duplicated cod
e
with a module_
l
ist
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-03-11
D
avid Aguilar
[PATCH
]
gitk: Don't s
h
ow local chang
e
s when we there
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree