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/kdiff3: do not use --auto when diffing
2013-05-09
Dav
i
d Aguilar
mer
g
e
t
o
o
ls/kdiff3:
d
o not use --au
t
o when diffi
n
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-04-16
D
avid Ag
u
i
lar
h
e
l
p
.
c: add a comp
a
tibility
c
o
mment to cmd_version()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
David
A
guilar
cont
r
ib/mw-to-git/t/install-
w
iki
.
sh: us
e
a lowe
r
c
a
se
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
David
Aguilar
contrib/
e
xamples/git
-
remote
.
per
l
: use a l
o
wercase
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
tests:
u
se a lowercase
"
usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
git
-
svn
:
use a lowercase "usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Aguilar
Documentation/use
r
-
m
anual
.
txt
:
use a lowercase
"
usa
g
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Agui
l
a
r
t
emplates/hooks--updat
e
.
sample: use a lowercase "usage
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Aguilar
contrib
/
ho
o
ks/setgitperms
.
perl
:
use a
l
o
w
e
r
case "
u
sage
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
A
g
uilar
contr
i
b/examples: use a
lower
c
ase "u
s
age:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
co
n
trib/fast-import/imp
o
rt-zips
.
p
y
:
use spaces ins
t
ea
d
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
uilar
c
o
n
t
r
ib/f
a
s
t
-impor
t
/
i
mport-zips
.
py: fix broken
er
r
or
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
c
o
ntrib/
f
ast-import: use a
l
owerca
s
e
"us
a
g
e:
"
s
t
r
i
n
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Aguilar
contr
i
b/credent
i
al: use a low
e
rc
a
se
"
usage
:
" st
r
i
ng
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Ag
u
ilar
git-cvsim
p
ort: use a lowercase "usag
e
:
"
s
tring
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
i
d
A
gui
l
a
r
git-cvsimport
:
u
se a l
o
wer
c
ase "usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-cvs
e
xportcommi
t
:
use
a lowercase "usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David
Ag
u
il
a
r
git-archimport: use a
lo
w
ercase "usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
avid
Agu
i
lar
git-merg
e
-one-file: us
e
a l
o
werca
s
e "us
a
ge:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David
Aguilar
git-r
e
link:
use a lowercase "us
a
ge:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Agui
l
ar
gi
t
-
svn: us
e
a lowe
r
case
"
usage:"
s
tring
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-sh-set
u
p:
use a l
o
w
e
rcase "usag
e
:"
s
tr
i
ng
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
David Aguilar
p4merge: fix
p
rintf usage
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
D
a
v
i
d
Aguilar
difftoo
l
-
-
helper:
fix pr
i
ntf
u
sage
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
David Aguilar
d
oc: g
e
nerate
a
list
o
f valid merge tools
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
David Aguilar
m
e
rgetool--lib
:
add functio
n
s for finding
available
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
Da
v
id Aguilar
mergetool--lib:
i
mprove the hel
p
t
ext in guess_mer
g
e_tool()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David Agui
l
ar
mergetool--lib: simpl
i
fy command expres
s
ions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
D
a
v
id Aguilar
mergetools: simplify how we handl
e
"v
i
m" an
d
"defaults"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
D
a
vid Aguilar
mergetool
-
-lib: imp
r
ove show_tool_h
e
l
p
(
)
outp
u
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
D
avid Aguilar
mergetools
/
vim: remove redu
n
dant diff
command
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-12-27
David Aguilar
mer
g
etools/p4merge: Honor
$
T
MPDIR for the /dev/null
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-10-11
David A
g
uilar
m
ergetools/p4
m
e
r
ge: Handle "
/
dev/null"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-25
David Aguilar
mergetool--lib: Allow custom commands to
override built-ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
David
Ag
u
ilar
git
k
: Rename
'
ta
g
con
t
ents' to 'cached_
t
agcontent'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
D
av
i
d Ag
u
ilar
gitk: Tea
c
h "Reread references" to reload tags
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-08-10
Davi
d
Aguil
a
r
merg
e
tool,difftool: D
o
cument --tool-he
l
p consistentl
y
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
Dav
i
d Aguilar
diffto
o
l: Disable --symlinks on cygwin
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David Agui
l
ar
d
i
fftoo
l
: Handle compare() returning -1
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
difftool
:
Wrap long lines fo
r
readability
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
David Aguilar
diff
t
ool
:
C
h
eck all return codes from
com
p
are()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
Da
v
id
A
guilar
dif
f
tool: Handle findi
n
g m
e
rget
o
o
ls/ in a path with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
Dav
i
d
Aguila
r
dif
f
tool
:
Use symlinks when
diffi
n
g again
s
t the worktree
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Agui
l
ar
dif
f
tool:
C
all
the temp direct
o
r
y
"git-difftoo
l
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
D
a
vid Aguilar
difftool
:
Mov
e
o
p
tion values i
n
to a hash
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David
A
guila
r
difftool: Elimi
n
ate global variables
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David
Aguilar
difftool: Simplify pr
i
n
t_
t
ool_
h
elp()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-03-19
Da
v
i
d
Aguilar
t780
0
:
Test difft
o
ol passing arguments to diff
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-01-23
David
A
guilar
mer
g
e
t
ool: Pr
o
vide an
e
mpty file when needed
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-30
Davi
d
Aguila
r
Makefile: Improve compiler header depe
n
dency check
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Agu
i
lar
mergetoo
l
s/meld: Use '--ou
t
p
u
t'
when av
a
ilabl
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
Da
v
id Agu
i
lar
mergeto
o
l
-
-lib:
R
efactor to
o
ls i
n
to separate files
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David
A
g
uilar
me
r
g
e
tool-
-
li
b
: Make style c
o
ns
i
stent
with
git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguila
r
difft
o
ol--helper: M
a
ke style consistent with gi
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-06-02
David Aguil
a
r
t/t7503-
p
re-commit
-
hook
.
s
h
:
A
d
d
GIT_PREFIX tes
t
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
D
a
vid
A
guilar
git-mergetool--l
i
b: Make vimdi
f
f
retain the
c
u
r
re
n
t
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Aguila
r
g
it: Remove h
a
nd
l
ing for GIT_PREF
I
X
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
Da
v
i
d Agu
i
lar
setup: Provide G
I
T_PREFIX to built-ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
D
avid Agu
i
lar
s
ubmodule s
y
n
c
:
U
pd
a
te "su
b
m
o
dul
e
.
<name>
.
url"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-17
David
A
guilar
mergetool: S
k
ip autoresolved paths
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
David Aguilar
Documentation: Exp
l
ai
n
gi
t
-mergeto
o
l's use
of temp
o
rary
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-29
Da
v
id Aguilar
Makefile: R
e
move usa
g
e of depre
c
a
ted
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
.
gu
i
tool
i
s unconfigur
e
d
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-23
David Aguilar
t7800
-
difftool
.
sh: Te
s
t
m
e
rgetool
.
p
rompt fa
l
lbac
k
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-16
Davi
d
Aguilar
d
i
f
ftool:
U
pd
a
te
c
opyright notic
e
s to list
e
ach year
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
difft
o
ol: U
s
e e
v
al t
o
expand
'--
e
xtc
m
d' exp
r
essions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
Da
v
id Agui
l
ar
d
i
fftool: A
d
d
'
-
x
' and as an alias fo
r
'--
e
x
t
cmd'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
Da
v
id Aguilar
t7800-difftool
.
sh:
Simplify
the --ex
t
cmd
test
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
git-d
i
ff
.
txt: L
i
nk to git-d
i
fftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
D
avid Aguilar
d
i
ff
t
oo
l
: Allow specifyin
g
u
nconfigured commands with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
D
a
vid
A
guilar
di
f
ftoo
l
-
-
h
e
lper: Re
m
ove use of the GIT_MERG
E
_TOOL
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguila
r
dif
f
t
ool--helper: Update copyr
i
g
h
t and remo
v
e
distra
c
t
ing
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
Da
v
id Aguilar
git-difftool: Add '--
g
u
i
' for sele
c
ting a
GUI tool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David
Aguilar
t7800-diff
t
o
o
l
:
Set a bogus tool for use b
y
tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
Dav
i
d Aguilar
help: D
o
n
ot unnecessar
i
ly look for a repository
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
David Aguilar
submodule
.
c: Squelch
a
"us
e
bef
o
re a
s
signment" warning
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
D
a
vid Aguilar
diff: generate pretty filenames i
n
prep_temp_blob()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
Da
v
i
d Aguilar
compat
:
ad
d
a basename() compa
t
i
bility fu
n
ctio
n
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David
A
guilar
compat:
a
dd
a mkstemps()
c
ompatibility function
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
Davi
d
Agu
i
lar
A
d
d
g
it-
r
eplace to
.
gitignore
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
David
A
guilar
m
e
rgetool--lib:
a
d
d support
for
a
raxis merge
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
Da
v
id Aguilar
merget
o
ol--
l
ib: s
p
ecialize diff
o
pti
o
ns f
o
r
emerge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
Davi
d
Aguilar
mergetoo
l
-
-lib: s
i
mp
l
i
f
y
API
u
sage by removing mo
r
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id
A
gu
i
lar
diff
t
ool/merg
e
t
o
ol: refactor comman
d
s to use git
-
merget
o
ol
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Aguilar
mergeto
o
l: use $(
.
.
.
)
instead of `backti
c
k
s`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
b
ash co
m
pletion:
a
dd git-diffto
o
l
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
av
i
d
Aguilar
di
f
f
t
o
ol: add support for a
difftool
.
promp
t
config
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Aguilar
difftool:
a
d
d
vari
o
us git-difftoo
l
tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: move '
g
it-di
f
ftool' out of contrib
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David A
g
uilar
d
i
fftool: add a -y shortcut for -
-
n
o
-prompt
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
avid
A
guil
a
r
di
f
ftool:
u
se perl built-ins when testing
f
or msys
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difft
o
ol: r
e
m
o
ve the b
a
ckup f
i
le
f
e
ature
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
ila
r
diffto
o
l
: remove merge options for opendiff, tkdiff
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-22
David Aguilar
everyday: use the
da
s
hless fo
r
m of git-
i
nit
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-12
D
avid Ag
u
ilar
contrib/difftool: u
s
e
a
s
ep
a
r
a
te co
n
fig na
m
espa
c
e for
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-01
David Aguilar
c
ontrib/difftool
:
Don
'
t repeat merg
e
tool c
a
ndidates
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
difftool: pu
t
the
c
ursor on the editable file for Vim
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
D
avid Ag
u
i
l
a
r
difftool: fix documentat
i
on proble
m
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-18
David
A
gu
i
lar
contrib:
a
dd 'git difftool' for
l
au
n
ching c
o
mmon
m
erge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-12-20
David Aguilar
gi
t
-mergetool: pr
o
perly handle "git mergetool -- filename"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
next