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-commit: only append a newline to -m mesg if necessary
2013-02-10
David Aguilar
p4merge:
f
ix printf u
s
age
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David Ag
u
ilar
difftool-
-
hel
p
er: fix
printf us
a
g
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David
A
gu
i
lar
doc: generate a list of valid
m
e
rge tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
D
avid Aguilar
mergeto
o
l--lib: add
f
u
n
ctions
f
or f
i
nding
avai
l
able
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
D
a
vid Aguil
a
r
mergetool--
l
ib: improve
the help text in guess_mer
g
e_tool()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
D
a
vid Agui
l
ar
mergetool--li
b
: simplify com
m
and e
x
pressions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
Davi
d
Aguilar
m
e
rgetools: simpl
i
fy
h
ow we
handle "v
i
m
"
and "def
a
u
lts"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David Aguila
r
m
ergetool--lib:
i
mprove sho
w
_tool
_
help(
)
output
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David Aguilar
mergetools/vim: re
m
ove redund
a
nt diff com
m
and
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-12-27
Dav
i
d
Aguil
a
r
m
e
rgetools/p
4
merge: Honor $TMPDIR fo
r
the /dev/null
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-10-11
D
a
vid Aguilar
me
r
g
etools
/
p4merge:
H
an
d
le "/
d
ev/null"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
David Aguilar
mergetoo
l
--lib: Allow cu
s
tom comm
a
nds
t
o
override built-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
Da
v
id Aguilar
g
itk:
R
ename 'tagconte
n
ts
'
t
o
'cached_tagcon
t
e
nt'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David Aguilar
g
itk: Teach
"Reread refe
r
ences" to reload tag
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
David Aguilar
mergetool,difftool
:
Documen
t
--tool-hel
p
consistentl
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David A
g
uilar
d
i
fftool: D
i
sa
b
le --s
y
mlinks on cygw
i
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
d
i
fftoo
l
: Handle compare() returning
-
1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
d
ifftool: Wrap lo
n
g lin
e
s f
o
r
r
eadabili
t
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
D
avid Aguilar
difftool:
Check all return codes from c
o
mpare()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David A
g
ui
l
ar
d
ifftool:
H
a
ndle findin
g
mer
g
etools/ i
n
a path with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Agu
i
l
ar
difftool: Use symli
n
ks wh
e
n d
i
ffing against the worktree
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
D
avid
A
gu
i
lar
diff
t
ool: Call the temp direct
o
r
y
"git-difftool"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Da
v
id Ag
u
ilar
d
ifftool:
Move option v
a
lues into a
h
ash
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Dav
i
d
Aguilar
dif
f
to
o
l:
E
liminate
g
lobal vari
a
ble
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Agu
i
l
ar
difftoo
l
: Simplify print_tool_help(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
David A
g
ui
l
ar
t78
0
0: Test dif
f
tool passing arguments
to d
i
ff
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
D
avid Aguila
r
me
r
getool
:
P
r
ov
i
de an empty fi
l
e when
n
eeded
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
David
Agui
l
a
r
M
akefile: Imp
r
ove compiler header de
p
en
d
ency check
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
m
e
rge
t
o
o
l
s/me
l
d:
U
s
e '-
-
output
'
when available
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
D
avid
A
guil
a
r
me
r
g
e
t
o
ol--lib: Refa
c
t
o
r tools int
o
separate files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
D
avid A
g
uilar
m
ergeto
o
l--lib: Make s
t
yle consisten
t
w
ith git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Dav
i
d
Aguilar
difftool--
h
elper: Make st
y
l
e
consistent with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
David Aguilar
t
/
t750
3
-pre-commi
t
-
h
ook
.
sh:
Add
GIT_PREF
I
X
tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
git-mergeto
o
l--lib: Make vi
m
di
f
f
r
etai
n
t
h
e curr
e
nt
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Ag
u
ilar
git: Remove han
d
l
ing for
G
IT_PRE
F
IX
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
se
t
u
p
:
Prov
i
de GIT_PREFIX to built-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
David Aguilar
su
b
module sync: Up
d
ate "submo
d
ule
.
<name
>
.
u
r
l"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-17
David Agu
i
lar
mergetool: S
k
ip a
u
toresolved paths
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
David
Agu
i
l
a
r
Documentati
o
n
: Explain git-mergetool'
s
use of temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
D
a
v
id Agui
l
ar
Makefi
l
e
: R
e
move
usage of
d
e
p
recated
P
ython "has_key
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
David Aguilar
difftool: Fix '--gu
i
' when diff
.
guitool is
unco
n
figur
e
d
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
D
a
vid
A
guilar
t
7
800-difftool
.
sh: Test merge
t
ool
.
prompt fal
l
ba
c
k
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
David
A
gui
l
ar
difftool: Upda
t
e
copy
r
ight not
i
ces to
l
ist
each year
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
Da
v
id Aguilar
d
ifftool: U
s
e eval
t
o expand '-
-
ext
c
md' expressions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
D
a
vid Aguilar
dif
f
t
o
ol: Add '-x' and as
a
n alias
for '--ex
t
cmd
'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
t7800-difftool
.
sh:
Simpl
i
fy the --extcmd t
e
st
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
D
a
vid
A
g
uilar
git-diff
.
t
xt: Link to g
i
t-difftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Da
v
id Ag
u
ilar
di
f
ftool: Allow specify
i
ng unconf
i
gured command
s
wit
h
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Davi
d
Aguila
r
difftoo
l
-
-
h
elp
e
r: Re
m
ove
u
s
e of t
h
e GI
T
_M
E
RGE_TOOL
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David
A
guilar
di
f
f
t
ool--h
e
lper: U
p
date copyright
a
nd re
m
ove
d
is
t
racting
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
Da
v
i
d
Ag
u
i
l
ar
git
-
difft
o
ol: Add '--gui
'
for selecting a GUI tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David A
g
uilar
t7800-difftool:
S
et a
bogus
tool for use b
y
tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
David A
g
uilar
help: Do n
o
t unn
e
cessarily look f
o
r
a
repo
s
it
o
ry
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
Davi
d
Aguilar
submodule
.
c:
S
qu
e
lch
a
"use before
a
ssig
n
m
e
n
t
" warning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David
Aguil
a
r
diff: generate prett
y
filenames in prep_temp_blob()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
c
omp
a
t: add a basename() compatib
i
lity
fu
n
ction
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
compat: add a
m
kste
m
ps()
compatibil
i
ty function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguil
a
r
Add git-
r
eplace to
.
gitign
o
re
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
David Aguilar
mergetoo
l
--lib:
a
dd
s
upport for araxis merge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
David Aguilar
me
r
g
e
tool
-
-
l
i
b: specialize
diff optio
n
s for emerge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
David Aguilar
me
r
getool--li
b
: simpli
f
y
A
PI
u
sage by removin
g
m
o
re
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Aguilar
d
i
fftool/mergetool: re
f
a
c
t
or com
m
and
s
to use git-merge
t
oo
l
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Aguil
a
r
merge
t
ool: use $(
.
.
.
)
i
nst
e
ad
o
f
`
backticks`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Aguilar
b
a
sh co
m
ple
t
ion: add git-di
f
ftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
i
d Aguila
r
dif
f
t
o
ol:
add support for
a d
i
f
f
t
ool
.
prompt config
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id
Ag
u
ilar
di
f
ftool: add various
git-difftool tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
av
i
d
Aguilar
difftool: move 'git-difftool' out of contrib
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
A
g
u
ilar
difftool:
add a -y shortcut for --no-promp
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguila
r
difftool: use perl built-ins
w
hen
t
es
t
ing
for msys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: remove the backup file feature
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Aguilar
d
ifftool
:
remove merge o
p
tions
for opendiff, tkd
i
ff
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
Dav
i
d
A
gui
l
a
r
ever
y
d
a
y: use t
h
e
da
s
hless
f
orm of git-init
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-12
David Aguilar
co
n
trib/dif
f
tool: use
a
se
p
arate con
f
i
g na
m
espa
c
e for
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
David Aguilar
contr
i
b/
d
ifftool: Don't repeat me
r
ge
too
l
c
a
ndida
t
e
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David A
g
uilar
d
i
fftool: p
u
t
the cursor o
n
the e
d
i
t
a
ble file
f
or Vim
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
Dav
i
d Aguil
a
r
difftool: fix
documentat
i
on problems
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-18
David Aguilar
contrib: add 'git dif
f
tool' fo
r
launching common merge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-12-20
Da
v
id
Aguilar
git-mergetool: properly
h
andle "git mergetool -- f
i
lenam
e
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-03
D
avid Aguilar
test
s
: add a t
e
st
c
ase for "git submodule s
y
nc"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-26
David Aguil
a
r
git-sub
m
odule: add "sync" command
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-23
D
avid Agu
i
lar
git-sub
m
o
du
l
e: r
e
place duplicated c
o
de with a m
o
du
l
e_li
s
t
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-03-11
D
avid Agui
l
a
r
[PA
T
CH] gitk: Don't show local changes w
h
e
n
we the
r
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree