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
p4merge: fix printf usage
2013-02-10
Davi
d
Aguila
r
p
4merge: fix
p
rintf u
s
age
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-12-27
David A
g
uilar
mergetoo
l
s/p4merge:
Ho
n
or $T
M
PDIR fo
r
the /dev
/
null
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-10-11
David
Aguila
r
mergetoo
l
s/p
4
merge: Handle
"
/dev/null"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
D
a
v
id Aguil
a
r
mergetool--li
b
:
Allow custom comman
d
s to override built-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
D
a
v
i
d
Aguilar
git
k
:
R
e
name
'ta
g
c
o
nten
t
s'
to 'cached_tagco
n
t
ent
'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
D
a
v
id
Aguilar
g
itk: Teach "Reread r
e
ferences"
to relo
a
d tags
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
Dav
i
d A
g
ui
l
ar
m
e
rgetool,difftool: Do
c
ument --tool-
h
el
p
cons
i
s
tently
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
D
avid
Aguilar
di
f
ftool: Disable --symlinks
o
n cygwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David
Aguilar
d
ifftool: Handle
c
om
p
are(
)
returnin
g
-1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
D
avid
A
g
u
i
lar
difftool: Wrap l
o
n
g
lines f
o
r
r
eadability
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David
A
guilar
difftool:
C
heck al
l
return codes from compare
(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
Da
v
id Aguilar
difftool:
Handle fi
n
ding merg
e
t
ools/ i
n
a path w
i
t
h
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David A
g
uilar
difftool
:
Use symlin
k
s w
h
en diffi
n
g
against the
worktree
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David
A
guilar
difftool: Ca
l
l
th
e
temp directory "g
i
t-difft
o
ol"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
D
avid Aguilar
difftool: Move option va
l
ues into a hash
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Da
v
i
d
Aguilar
difftool: Eliminate
g
l
o
bal variable
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguil
a
r
diff
t
ool: S
i
mplify print_to
o
l_help()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
David
A
g
u
i
lar
t7800: Test di
f
ftool passing
argum
e
nts to dif
f
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
David Ag
u
ila
r
merg
e
too
l
: Provide
a
n
e
mpt
y
file
when nee
d
e
d
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
D
a
vid
Ag
u
ilar
Makefile:
Imp
r
ov
e
compi
l
er head
e
r dependency check
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Ag
u
ilar
m
ergetools
/
m
e
ld: Use '
-
-output' when
a
vail
a
bl
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Ag
u
ilar
mer
g
etool--lib: R
e
factor
t
ools into
s
epar
a
te files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Davi
d
Aguilar
me
r
g
etool--l
i
b: Make
s
tyle consisten
t
with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Agu
i
lar
di
f
f
t
ool--helper: Ma
k
e style
co
n
si
s
te
n
t
wi
t
h
g
it
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
David Aguilar
t
/t750
3
-
pre-commit-hook
.
sh: Ad
d
G
I
T_
P
REFIX tes
t
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David A
g
uilar
git-merg
e
tool--
l
i
b
:
Make vimdiff retain the cu
r
r
en
t
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
git: Rem
o
ve handlin
g
for
GIT_PR
E
FIX
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
Davi
d
Aguilar
setu
p
: Provide GIT_PREFIX to built-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
David Ag
u
ilar
submodule sync: Update "submodule
.
<name>
.
url"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-17
David
Agui
l
a
r
mergetool: Skip autoresol
v
ed path
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
David
A
guilar
Document
a
tion
:
Explain g
i
t-merge
t
ool's
u
se
of tempor
a
ry
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
David A
g
uila
r
M
a
kefile: Remove
u
sage of depreca
t
ed Python "ha
s
_
k
ey
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
David
A
guilar
diffto
o
l: Fix '
-
-gui'
w
hen
d
iff
.
gu
i
t
o
ol is unc
o
nfigured
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
D
avid Aguilar
t7800-
d
if
f
tool
.
sh: T
e
st
mergetool
.
prompt
fallback
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
Davi
d
Agui
l
ar
difftool: Update copyright notices
t
o
l
ist each
yea
r
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
difftool: Use eval to ex
p
an
d
'--ex
t
c
md'
ex
p
ressions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguila
r
dif
f
t
o
ol: Add '-x' and as an alias for '-
-
extcmd
'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
t
7800
-
diffto
o
l
.
sh: Si
m
plify the -
-
extcmd tes
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
git-diff
.
txt: Link
to g
i
t-difftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
D
avid Agu
i
lar
d
i
fftool: Allow s
p
ecif
y
ing unconfigured commands with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Da
v
id Aguilar
d
i
fftoo
l
-
-helper: Re
m
ove u
s
e of the
G
I
T_
M
E
R
GE_TOOL
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David
Aguila
r
diffto
o
l--helper: Update copyright a
n
d
remove distracting
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David Aguil
a
r
git
-
difftoo
l
: Add '--
g
u
i' for selecting a GUI tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
Dav
i
d
Aguila
r
t7800-diff
t
o
o
l:
Set a bogus
t
ool for use by t
e
sts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
David
A
g
u
i
la
r
help: Do
n
ot unn
e
cessarily look for
a
re
p
ository
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
David Aguilar
submodule
.
c: S
q
u
e
l
ch a "use befor
e
assign
m
e
n
t" w
a
rning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguil
a
r
d
i
f
f: gener
a
te pretty filenames i
n
p
r
ep_t
e
m
p
_blob()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Dav
i
d Aguilar
c
ompat: ad
d
a
basename
(
) com
p
atibil
i
ty
function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
D
a
vi
d
A
g
u
i
lar
compat:
add a mk
s
t
emp
s
() compatibility
f
unction
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
A
d
d git-replac
e
to
.
gitignore
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
David Ag
u
ilar
m
erg
e
tool-
-
lib:
a
dd sup
p
ort
f
or araxis me
r
g
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
David
A
guilar
mergetool
-
-lib: special
i
ze
diff options fo
r
emerg
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
Da
v
id A
g
uilar
m
e
rgetool-
-
lib: simplify API usa
g
e by
r
e
moving
more
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Aguil
a
r
di
f
f
tool/mergetool:
refa
c
tor commands to use g
i
t-merget
o
ol
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
A
guilar
mergetool: use $(
.
.
.
) i
n
stead of `backtic
k
s
`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
ilar
bash comple
t
ion: add git-diff
t
ool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Aguilar
difftool: add support fo
r
a dif
f
to
o
l
.
prompt con
f
ig
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguil
a
r
d
i
fftool: add various git-difftool te
s
ts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Agui
l
ar
d
i
f
f
tool: m
o
ve 'git-difftool' out of contrib
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Aguilar
diff
t
o
o
l: add
a
-y shortcut
for --no-prompt
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Agui
l
a
r
di
f
fto
o
l: use perl buil
t
-ins when testing for msy
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Aguil
a
r
di
f
ftool: re
m
ove the bac
k
u
p
fi
l
e feature
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguil
a
r
d
ifftool: r
e
mo
v
e m
e
rg
e
options fo
r
opendiff, tkdiff
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
David A
g
uilar
e
v
er
y
day: use the dashle
s
s
f
orm of git-init
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-12
D
a
vid Aguilar
contrib/d
i
f
ftool: use a separ
a
te config namespace for
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
David
Ag
u
il
a
r
c
o
ntrib/
d
if
f
t
ool: Don't
r
e
p
eat merg
e
tool candidates
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
difftool: put the cur
s
or on the
e
d
itable file fo
r
Vim
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
d
ifftool
:
f
i
x documen
t
a
t
io
n
probl
e
ms
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-18
David Aguilar
c
o
ntrib: add 'git
d
i
ff
t
ool' for launching co
m
mon merge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-12-20
David Agu
i
lar
git-
m
erg
e
tool: properl
y
handle
"git mergetool --
filename"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-03
D
a
vid Aguilar
tests: add a testcase fo
r
"git submodul
e
sync"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-26
David A
g
uilar
git-s
u
b
m
odule: add "sync" command
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-23
D
a
v
i
d Ag
u
i
l
ar
git-
s
ubmodule:
r
eplace
d
upl
i
cated code with a
mo
d
ul
e
_list
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-03-11
Davi
d
A
g
uilar
[PATC
H
] gitk: Do
n
'
t show local chang
e
s when
we there
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree