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
contrib/mw-to-git/t/install-wiki.sh: use a lowercase "usage:" string
2013-02-25
David
A
guilar
contrib/mw-to-
g
i
t
/
t/ins
t
all-wiki
.
sh: use a lowe
r
case
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
David Ag
u
ilar
contrib/example
s
/git-r
e
m
ote
.
perl: u
s
e a
l
owercas
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
D
a
vid Aguilar
tests
:
use a lowerc
a
se
"
usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
Davi
d
Aguilar
git-svn: use a lowercase "usage:" str
i
ng
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Aguil
a
r
Doc
u
mentation/user-ma
n
u
a
l
.
txt:
use a lower
c
ase "usage
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Agu
i
l
a
r
template
s
/hooks-
-
upd
a
t
e
.
sample: use a lo
w
erca
s
e "us
a
g
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
c
o
ntrib/hooks/setgitp
e
rms
.
perl: use a lowerc
a
se "usage
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Ag
u
il
a
r
contrib/examples
:
use
a l
o
w
e
r
case
"usage:" strin
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Aguilar
cont
r
ib/fast-import/import-zips
.
py: use
spaces
i
nstead
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguil
a
r
contr
i
b/fast-imp
o
rt/impor
t
-zip
s
.
py
:
fix
broken error
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Agui
l
ar
con
t
rib/fast
-
import: use a
lowercase "
u
sage:" str
i
ng
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Agui
l
ar
contrib/c
r
edential: use a lowercase
"
usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Aguilar
git
-
cvsimp
o
r
t
: use a lowercase "usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-
c
v
s
import: use a lower
c
a
s
e
"usage:" s
t
ring
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id
A
guilar
git-cvsexportcommi
t
: use a lowercase "us
a
ge
:
" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Agu
i
lar
gi
t
-arch
i
mport: use a lower
c
ase
"
usag
e
:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Aguil
a
r
git-merg
e
-one-fil
e
: use a lowercase "usa
g
e:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-relink: use
a lower
c
ase "us
a
ge:" str
i
ng
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Aguilar
g
it-svn:
use a lowercase
"usage:" stri
n
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Aguilar
git-sh-se
t
up:
u
s
e a
l
ower
c
ase "usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
David Ag
u
ilar
p
4m
e
r
g
e
: f
i
x
p
r
intf usag
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
D
a
vid Aguilar
d
i
f
f
tool--helper: fix printf usage
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
David Aguilar
doc: g
e
n
erate a li
s
t
of valid me
r
ge tools
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
D
a
vid Aguilar
merg
e
tool--lib: add functio
n
s for finding av
a
i
l
able
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
D
a
v
i
d Aguilar
merg
e
t
o
ol--l
i
b
: im
p
r
o
ve the help text in guess_merg
e
_tool()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
Dav
i
d Aguil
a
r
mergetool--lib:
simplify
command exp
r
ession
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
merg
e
tools: sim
p
lify how we handle "vim"
and "defaults"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
David Aguilar
m
e
rgetool--lib
:
impro
v
e show_
t
ool_
h
elp() output
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
Dav
i
d Aguilar
me
r
getool
s
/vim: remov
e
redundant
d
i
ff
c
omma
n
d
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-12-27
Davi
d
Aguil
a
r
m
e
rgetool
s
/p
4
merge: Honor $TMPDIR for t
h
e /dev/nu
l
l
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-10-11
David Aguilar
merg
e
t
o
ols
/
p4merg
e
: H
a
ndle
"/de
v
/nu
l
l
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-25
David A
g
uilar
mergetool--lib: Allow custom
c
omm
a
nd
s
to override buil
t
-
i
ns
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
David Aguilar
gitk:
Rena
m
e '
t
ag
c
onte
n
ts'
t
o 'cached_tagcontent'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
David Aguilar
gitk
:
Teach "Reread references"
t
o re
l
oad tags
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-08-10
Dav
i
d Aguilar
m
e
rge
t
ool,
d
ifftool: Document
--tool-h
e
lp consi
s
t
ently
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
Davi
d
A
guil
a
r
difftool: Di
s
able --symli
n
ks on cy
g
win
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
d
i
fft
o
ol:
Handle compare
(
)
r
eturning -1
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
Davi
d
Aguilar
difftool: Wrap long
l
ine
s
f
or readabil
i
ty
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
Dav
i
d Aguilar
d
ifftool: C
h
eck all return codes from c
o
mpare(
)
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
David Aguilar
difft
o
ol: Handl
e
f
in
d
in
g
m
erge
t
oo
l
s
/
in
a path
with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David
Aguil
a
r
difftoo
l
: Use symlin
k
s when diffing against
the
workt
r
ee
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
Da
v
id Aguilar
d
i
f
f
t
ool: Call
t
he temp directo
r
y "git-difftool"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David
A
g
uilar
difftool: Move option values into a
h
ash
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
Da
v
id
A
guilar
d
ifftool
:
Elimina
t
e global
v
a
ria
b
les
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
diffto
o
l
:
S
i
mplify
p
rint_too
l
_hel
p
()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-03-19
David Aguilar
t7800
:
T
e
st
d
ifftoo
l
pass
i
n
g
arguments to diff
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-01-23
David Aguil
a
r
mergetool: Provide an empty file
w
hen
n
e
e
ded
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-30
David Ag
u
il
a
r
Makefile: Imp
r
o
ve compile
r
header depe
n
dency ch
e
c
k
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
Da
v
id Agui
l
ar
mergetools/
m
eld: U
s
e '--ou
t
pu
t
' when
a
v
ailable
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
D
a
v
i
d Aguilar
m
ergetool--lib:
R
e
factor too
l
s into separate files
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
Davi
d
Aguil
a
r
me
r
geto
o
l--lib: Make styl
e
cons
i
st
e
n
t with git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
Da
v
id Aguilar
difftoo
l
--helper: M
a
ke st
y
l
e cons
i
stent with git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-06-02
D
avid Aguilar
t
/
t75
0
3-
p
re-commit-h
o
ok
.
sh: Add GIT_PREFIX tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
D
a
vid Aguilar
git-mergetool
-
-lib:
M
a
k
e vimdiff retain the curr
e
nt
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Ag
u
ilar
git: Remo
v
e handling for GIT_PREFIX
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Agu
i
lar
se
t
up:
Pro
v
i
d
e GIT_PR
E
F
I
X to
built
-
ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
D
a
vid A
g
u
ila
r
s
ubmodule sy
n
c
:
Up
d
at
e
"subm
o
dule
.
<
n
ame>
.
ur
l
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-17
David Aguil
a
r
m
erg
e
tool:
Skip
a
utoresolved paths
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
David Aguilar
Documentation: Explain git-mergetool's use of t
e
m
p
o
rar
y
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-29
David Aguila
r
Makefile: Remov
e
u
s
age of
d
eprec
a
ted
Python "ha
s
_key
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-28
David Aguilar
difftool: Fix
'--gu
i
' wh
e
n diff
.
guitool
is unco
n
figu
r
ed
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-23
D
a
vid Aguila
r
t7
8
00-diff
t
ool
.
sh:
Test mergetool
.
prompt
f
allback
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-16
David Aguila
r
d
i
fftool: Up
d
ate copyright
notice
s
to list
e
ach
year
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Agu
i
lar
difftool:
U
se eva
l
t
o
exp
a
nd
'
-
-
extcmd' expressions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Ag
u
ilar
diff
t
ool: Add '-
x
' and a
s
an alias for '--extcm
d
'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Ag
u
ilar
t7800-diff
t
ool
.
sh:
Si
m
plify
t
he
-
-extcmd test
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
git-diff
.
txt: Link to git-difftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
difftool: Allow specifying unconfigured commands with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
D
avid Aguilar
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 Ag
u
i
la
r
difftool--h
e
lper: Update copyright and
re
m
ove distracting
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David Agu
i
lar
g
i
t
-difftool: Add '-
-
gui' for selecting a GUI tool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David Agui
l
ar
t78
0
0-difftool
:
S
et
a
b
ogus tool for us
e
by tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
David
Ag
u
ilar
help: Do
not
u
n
n
e
c
essarily look
for a repository
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
Davi
d
Ag
u
i
l
a
r
submodu
l
e
.
c: Squelch a "use
b
efore
ass
i
gnment
"
warning
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
diff: gen
e
rate pretty filenames i
n
prep_temp_blob
(
)
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguil
a
r
c
ompat: ad
d
a
ba
s
enam
e
(
)
comp
a
tibility fun
c
tion
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David
A
guilar
compat:
add a m
k
stemps()
compatibility f
u
nction
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
Add git
-
replace to
.
gitignore
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
D
avi
d
Agui
l
a
r
merge
t
ool--lib
:
add support for araxis
m
erge
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
David A
g
uilar
merget
o
ol
-
-lib: spec
i
ali
z
e di
f
f options for em
e
rge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
David Aguilar
merget
o
ol--lib: sim
p
l
i
fy AP
I
usage by
r
emoving m
o
re
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool/mergetoo
l
:
r
efac
t
or
c
omm
a
nd
s
to use g
i
t
-
me
r
getool
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
A
guilar
mergetoo
l
:
use
$
(
.
.
.
)
instead of `backt
i
cks`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Ag
u
ilar
ba
s
h com
p
letion:
a
d
d
git-diffto
o
l
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
ilar
dif
f
to
o
l: add supp
o
rt
f
o
r
a
d
if
f
tool
.
pr
o
m
p
t config
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Aguilar
d
ifftool: ad
d
var
i
o
u
s
git-dif
f
tool tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguil
a
r
dif
f
tool: move 'gi
t
-
diff
t
o
ol' ou
t
of con
t
rib
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Aguilar
difftool: add a
-
y
short
c
ut for --no-prompt
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d
A
guilar
dif
f
tool: use perl built-ins wh
e
n testing for
msys
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Agu
i
lar
difftool: remove
th
e
b
ackup file featu
r
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Aguilar
d
ifftool: rem
o
ve merge options for op
e
ndiff, tkdiff
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-22
Da
v
id Ag
u
i
lar
everyday: us
e
th
e
das
h
less
f
orm of git-ini
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-12
Dav
i
d Ag
u
ilar
co
n
trib/difftool: use a separate con
f
ig
namespace for
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-01
D
avid Aguilar
contrib/difftool:
Don't re
p
eat merg
e
tool
c
andidat
e
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David
Aguilar
difftool:
p
u
t th
e
cu
r
sor on the ed
i
table file for Vim
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
difft
o
ol: f
i
x
documentation probl
e
ms
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-18
David Aguilar
contrib: a
d
d 'git difftool' for
l
aunc
h
ing common m
e
rge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-12-20
David Aguilar
git-mergeto
o
l: properly handl
e
"git merg
e
t
ool
-
- filename"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-03
David Aguilar
tests: add a testcase f
o
r
"git submodule sync"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-26
Dav
i
d Aguilar
g
it-sub
m
od
u
le: a
d
d "syn
c
"
co
m
mand
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
next