repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
git-remote-mediawiki: better error message when HTTP(S) access fails
2013-05-09
D
avid Aguilar
mer
g
et
o
ols/kdiff3: do
n
ot us
e
--auto
when
dif
f
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-04-16
David Agu
i
lar
hel
p
.
c
:
a
dd a
c
ompatibilit
y
comm
e
nt
to cm
d
_ve
r
sion(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
Dav
i
d Aguilar
contrib/mw-to-git
/
t/install-wiki
.
sh: use a lowercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
contrib/
e
xample
s
/git-remote
.
perl:
u
se
a low
e
rcase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
Dav
i
d A
g
uilar
te
s
ts: use
a
l
owercas
e
"
usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
Dav
i
d A
g
uilar
git-svn: use a lower
c
ase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Aguila
r
Documentation/user-manual
.
t
xt: use a lowercase "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
uilar
te
m
plates/hooks-
-
upd
a
te
.
sam
p
le: use a lower
c
ase
"
u
sage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Aguilar
contrib/hooks/setgit
p
erms
.
pe
r
l
:
u
s
e
a lowercase "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Aguilar
cont
r
i
b/examples: use a lowercase "usage:"
s
tring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguila
r
contrib
/
fast-
i
m
po
r
t/import-zips
.
py: use spac
e
s i
n
s
t
ead
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
u
i
lar
contrib/fast-imp
o
rt/
i
mport
-
zips
.
py: fix
brok
e
n err
o
r
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
co
n
t
r
i
b/fast-import: 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
contrib/cr
e
dent
i
a
l: use a l
o
wercase "usage:
"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
g
it-cvs
i
mport: use a
l
owercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Aguil
a
r
g
it-cvs
i
mp
o
rt: u
s
e
a
lo
w
ercas
e
"us
a
ge:" str
i
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Aguilar
git-c
v
se
x
p
ortcommit:
u
se a
l
owercase "
u
sage:" stri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
uilar
git-archi
m
port: us
e
a lowercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-merge-o
n
e-file:
u
s
e a lo
w
ercase "usage:"
s
t
ri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Aguila
r
git-re
l
ink: use
a
lo
w
e
rcas
e
"usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-svn: use a
l
owerca
s
e "usage:"
s
tring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Aguilar
g
it-sh-setup: use a l
o
wercase "us
a
ge:" st
r
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
Dav
i
d Aguilar
p
4
m
erge: fix print
f
usa
g
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
Da
v
id Agui
l
ar
difft
o
ol--helper: fix printf u
s
age
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
Dav
i
d
Aguilar
doc:
generate a
l
ist
o
f valid merge tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
D
a
vid Agui
l
ar
merge
t
ool--lib:
a
dd functions for
finding available
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
Da
v
i
d Agu
i
lar
m
er
g
et
o
ol
-
-lib:
improve the he
l
p
t
ext i
n
gu
e
ss_me
r
ge_tool()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Agui
l
ar
mergetool--lib: simplif
y
command expr
e
ssions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
Dav
i
d Aguilar
mergetools:
si
m
pl
i
fy how we handle "vi
m
" and "d
e
faults
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David
Aguilar
m
e
rget
o
ol--lib: improve s
h
o
w_to
o
l_help(
)
o
utpu
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David
A
guilar
mergetools/vim: remove redundan
t
dif
f
command
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-12-27
Da
v
id Ag
u
ilar
mergeto
o
ls/p4m
e
rge: Honor
$TMPDIR for
t
h
e
/dev/n
u
ll
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-10-11
David Agu
i
lar
mergetools/p4merge: Handle "/dev
/
null"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
David Aguil
a
r
me
r
g
e
t
ool--l
i
b
:
Allow custom com
m
ands to ov
e
rride buil
t
-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David Aguil
a
r
git
k
:
R
en
a
me '
t
a
gcontents' to 'cached_tagcontent'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David Aguilar
gitk: Teach "Reread referen
c
es" to relo
a
d tags
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
David Agu
i
lar
m
e
rgeto
o
l,d
i
fftool: D
o
cumen
t
-
-tool-help cons
i
sten
t
ly
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Ag
u
ilar
difftool
:
Dis
a
b
l
e
--sym
l
inks on cy
g
win
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David
Ag
u
il
a
r
difftoo
l
: Han
d
le compare() returning -
1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
Da
v
i
d A
g
uilar
d
i
f
ftoo
l
: Wra
p
long lines for readab
i
lity
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
Dav
i
d Aguilar
difftool: Chec
k
all r
e
turn codes from compare()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
Davi
d
Aguilar
di
f
ftoo
l
: H
a
ndle finding me
r
ge
t
ools/ i
n
a path
with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Dav
i
d
Aguila
r
difftool: U
s
e symlinks wh
e
n diffing against
t
he wo
r
ktree
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David A
g
uilar
difftool: Call the temp directory "git-d
i
f
f
t
o
ol"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Davi
d
Aguilar
difftool: Mo
v
e option
v
alu
e
s in
t
o a hash
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
D
a
vid Agui
l
ar
difftool: Elimi
n
ate
g
lob
a
l v
a
riables
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftool: Simplify
p
r
i
nt_to
o
l_help(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
David Aguilar
t
7
8
00
:
Tes
t
difftool passing arguments
to
d
iff
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
David Agu
i
l
a
r
m
e
rgetool: Provide an empty
file
w
hen needed
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
David Agu
i
lar
Makefil
e
: Improve comp
i
ler header dependency ch
e
ck
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
mergetools/meld: Use '--o
u
tput' when ava
i
lable
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
D
a
v
i
d Aguilar
m
erg
e
tool--lib: Refactor tools into se
p
a
ra
t
e
files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguil
a
r
merget
o
ol-
-
lib:
Mak
e
style
cons
i
stent with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
difftool
-
-helper: Make style consis
t
e
n
t with gi
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
Da
v
id Aguilar
t
/
t
7
5
03-pre-commit-hook
.
sh:
A
dd GIT_PREFIX t
e
sts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
git-merget
o
ol--lib: Mak
e
vi
m
diff
r
etain
t
h
e cu
r
rent
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
g
it: Remove
h
andling
f
or GIT_PREFIX
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
se
t
up:
P
r
ovide GIT_PREFIX to built-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
David Aguil
a
r
submo
d
ule sync: Update "submodule
.
<
n
a
me
>
.
url"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-17
Dav
i
d Aguilar
mergetool:
Ski
p
a
u
tores
o
lv
e
d paths
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
David Agui
l
ar
Documen
t
a
t
ion: Expla
i
n
g
it
-
merget
o
ol's us
e
o
f tempora
r
y
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
David Aguil
a
r
Makefile: Remo
v
e us
a
ge of deprecated Python "h
a
s
_
key
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
David Aguilar
difftool: Fix '--gui' when diff
.
g
ui
t
ool
i
s u
n
configu
r
ed
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
David Ag
u
ilar
t7800-diff
t
ool
.
s
h
: Test
m
ergetool
.
promp
t
fall
b
a
c
k
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
D
avid A
g
uilar
difftool: Up
d
ate copyright notices to list
e
ach year
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Agui
l
ar
difftool: Use e
v
al to expand
'--extc
m
d
'
e
x
pression
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
d
i
fftool: Add '-x' and as an alias for '-
-
ex
t
cmd'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguila
r
t7800-diff
t
oo
l
.
sh: Simplify the
-
-extcm
d
test
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
D
a
vid Aguila
r
git-diff
.
t
x
t
: Link to
g
it
-
d
i
fftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
D
avid Aguilar
difftool: Allow specifying un
c
onfi
g
ured c
o
mmands with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David
A
gui
l
a
r
diffto
o
l--helper
:
Remove use of
the G
I
T_MERGE
_
T
O
OL
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
D
avid Aguil
a
r
d
i
fftool--
h
e
l
per:
Update co
p
yri
g
ht and remove
distract
i
ng
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David Agui
l
ar
git-
d
ifftool:
Add '--gui'
fo
r
select
i
ng a GUI tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David Aguil
a
r
t
78
0
0-diffto
o
l: Set a bogus tool for use by tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
David
Aguilar
help: Do not u
n
necessari
l
y look for a repository
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
David Aguilar
su
b
module
.
c: Squel
c
h
a
"
use before
a
ssignment" warning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
D
av
i
d
Ag
u
ilar
dif
f
: generate pretty fi
l
en
a
m
es in pr
e
p_te
m
p_b
l
ob()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
co
m
pat: add a
basename()
compatibi
l
ity funct
i
on
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Dav
i
d Aguilar
compat: add a mkstemps(
)
compa
t
ibil
i
t
y
fun
c
tion
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David
A
guilar
Add
git-r
e
place
t
o
.
giti
g
no
r
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
David
A
gui
l
ar
mergeto
o
l--lib
:
add support f
o
r araxis merge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
Da
v
id Aguilar
mergetool-
-
lib
:
sp
e
ciali
z
e
d
iff optio
n
s
for emerge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
David Aguilar
mergeto
o
l--lib: simplify API
u
s
a
g
e by removing more
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
dif
f
tool/m
e
rgetool:
r
efact
o
r
commands to use git
-
m
e
rgetool
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
ilar
mergetool: use $
(
.
.
.
) instead
o
f `backti
c
ks
`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
b
a
sh
c
om
p
let
i
o
n
: add git-dif
f
tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguila
r
difftool:
add support for
a
difftool
.
p
rom
p
t config
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
Agui
l
ar
difftool: add various git-difftool tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Aguilar
difftool: move 'git-dif
f
too
l
'
out of contrib
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vi
d
Aguilar
difftoo
l
: add a -y shortcu
t
for -
-
no-prompt
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
v
id
Aguil
a
r
d
i
fftool:
use perl built
-
ins when testing f
o
r msys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id
Aguil
a
r
difft
o
ol:
remove the backup f
i
le feature
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
avi
d
Agui
l
a
r
difftool: r
e
move merge options fo
r
opendiff
,
tkdiff
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
Dav
i
d Aguilar
everyday:
us
e
the
d
ashless fo
r
m o
f
git-init
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-12
D
a
vid Aguila
r
contrib/
d
ifftool: use a sepa
r
ate config
n
a
me
s
pace f
o
r
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
D
a
vid Aguilar
c
o
nt
r
ib/d
i
fftool: Don't
r
epeat m
e
rge to
o
l candidates
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David Agu
i
lar
difftool
:
put
t
he curs
o
r o
n
the editable file for Vim
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David Aguila
r
di
f
fto
o
l
:
fi
x
docume
n
tation pro
b
lems
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-18
Davi
d
Agui
l
ar
con
t
rib:
add 'gi
t
d
i
f
f
tool' for launc
h
i
n
g common
me
r
ge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-12-20
David Agu
i
lar
git-mergetool
:
prop
e
rly
h
andle "git merget
o
o
l
-- filename"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next