repo.or.cz
/
git
/
git-svn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Git 1.8.3-rc2
2013-05-09
David Agui
l
ar
mergetools/kdi
f
f
3
: do not use -
-
auto
w
hen d
i
ffing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-04-16
Da
v
id Aguilar
he
l
p
.
c: add
a com
p
at
i
bility com
m
ent
t
o
cmd_versio
n
()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
contrib
/
mw-to-git/t/install
-
wiki
.
sh:
use a l
o
werc
a
se
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
D
avi
d
A
g
u
il
a
r
co
n
trib/
e
x
am
p
l
es/git-remote
.
perl:
use a lowercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguil
a
r
te
s
ts
:
use
a lowercase "usag
e
:"
s
tring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
gi
t
-
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/u
s
er-ma
n
u
al
.
txt: use a lowerc
a
se "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
t
e
mpla
t
es/hooks--updat
e
.
sample: use a
lowercase "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Agui
l
ar
cont
r
i
b
/ho
o
ks/setgitper
m
s
.
p
e
r
l: use a lo
w
ercase "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Aguilar
co
n
t
ri
b
/e
x
a
m
pl
e
s: use a
lowerc
a
se "usage:"
s
tring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
c
ontrib/fast-import/import-zi
p
s
.
py
:
use spaces instea
d
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguila
r
contrib
/
fast-import/import-zips
.
py: fix broken er
r
or
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid
Aguilar
contrib
/
fast-import
:
use a lowercase
"
usa
g
e:" stri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contrib
/
cred
e
nti
a
l:
use a lowercase "usa
g
e:" st
r
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
v
i
d
Aguilar
git-cvsimport: use a lowerca
s
e "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git
-
cvsim
p
ort: u
s
e
a lowercase "usage:"
s
tring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Aguil
a
r
git-
c
vsexp
o
r
t
c
ommi
t
: us
e
a lowerc
a
se "usag
e
:"
s
tri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-archimpor
t
:
use
a lowercase
"
usage:" strin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Aguila
r
git-merg
e
-
o
ne-file: use a lowercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
g
i
t-relink: use a lowercase "usage
:
" st
r
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
guila
r
g
it-svn: use a lowercase "usage
:
" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Aguilar
git
-
s
h
-setu
p
: use a lo
w
ercase "usage:"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
Da
v
id Aguilar
t7800: "defaults"
is no long
e
r a bui
l
tin t
o
ol name
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
Dav
i
d Aguilar
t7800: modernize tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-20
David
A
guilar
t
7
800: update copyright notice
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-17
David Aguilar
difftool: sile
n
ce uni
n
itialize
d
variable warning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David Aguilar
p4merge:
f
ix p
r
intf usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David Aguilar
diffto
o
l--helper:
fix printf
u
sage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David Aguila
r
doc: generate a list of v
a
l
id me
r
ge t
o
ols
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
Davi
d
Aguilar
mergetool--lib: add fu
n
ct
i
o
n
s for finding ava
i
lable
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David
Aguilar
mergetool-
-
l
ib
:
im
p
rove 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 Aguilar
mergetoo
l
--
l
ib
:
s
implif
y
co
m
mand expressio
n
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Ag
u
ilar
mergeto
o
ls: si
m
plify ho
w
we handle
"vim" and "defaults"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David
A
guilar
m
e
r
getool-
-
lib: imp
r
o
ve show_tool_help() ou
t
put
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
D
a
v
i
d Agu
i
lar
mergeto
o
ls/
v
i
m
:
remove red
u
ndant diff co
m
mand
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-12-27
David Aguilar
mer
g
etools/p4m
e
rge: Honor $TMPD
I
R for the /dev/null
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-10-11
David Aguilar
mergeto
o
ls/
p
4merge: H
a
ndl
e
"
/de
v
/
n
ull"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
David Aguilar
mergetool--lib: Allow c
u
s
tom commands to override built-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David
A
guilar
gitk: Rename 'tagcontents' to '
c
ached_t
a
g
c
ontent'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
Da
v
id
Agu
i
lar
gitk: Teach "Reread refere
n
ces" to relo
a
d tags
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
Da
v
id Aguilar
mer
g
e
t
o
o
l,diff
t
ool: Documen
t
-
-
tool
-
help consis
t
ently
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Ag
u
ilar
difftool: D
i
sab
l
e -
-
symlinks on
c
ygwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David
Agu
i
l
a
r
di
f
ftool: Handle co
m
pare
(
)
re
t
urning -1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David A
g
uilar
difftool: Wrap
l
on
g
l
i
nes for reada
b
ility
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David
A
guilar
difftool:
C
heck
al
l
re
t
u
r
n
codes from
c
ompa
r
e(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
D
av
i
d Aguilar
difftool: Ha
n
dle finding mergetools/ in
a
path with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
d
ifftool: Use symli
n
ks wh
e
n diff
i
ng against the workt
r
e
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftool: Call the temp
d
ire
c
tory "git-difftool"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Davi
d
Aguilar
d
i
fftool: Move option values into
a h
a
sh
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Agu
i
lar
difftool: Eliminate
global va
r
iabl
e
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
D
a
vid Ag
u
ilar
difftoo
l
:
Si
m
p
lify print_tool_help()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
David
Aguilar
t7
8
00: Test difftool p
a
ssing
argume
n
ts
to d
i
ff
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
Davi
d
Aguila
r
mergetool: Provide
an
e
m
p
ty f
i
le when
n
eeded
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
David Agu
i
lar
Makefile
:
Improve compil
e
r header depende
n
cy ch
e
ck
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
mergetools
/
meld:
U
se '
-
-o
u
tpu
t
' when a
v
a
ilable
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Agui
l
ar
mergetool--lib: Refactor tools into sep
a
rat
e
f
i
les
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
mer
g
etool--lib: Mak
e
style consistent w
i
th git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Da
v
id Aguilar
dif
f
tool--helper: Make style consi
s
tent with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
Dav
i
d Aguilar
t/t
7
503-pre-commit-hook
.
sh: Add GI
T
_PR
E
FIX
t
est
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
D
avid Aguilar
git-mergetoo
l
--
l
ib: Make
v
imdiff re
t
ain the current
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
D
avi
d
Aguilar
gi
t
: Remove
h
andl
i
ng for GIT_PREF
I
X
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David
A
guilar
setup: Provide GI
T
_PREFIX t
o
buil
t
-i
n
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
David Aguilar
submo
d
u
le
s
y
nc: Update "s
u
bmodule
.
<
n
ame>
.
u
rl"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-17
David Aguil
a
r
merget
o
ol: Sk
i
p a
u
toreso
l
ved paths
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
Da
v
id Aguila
r
Document
a
t
ion: Explain git-mergetool's us
e
of temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
David
Aguilar
Mak
e
file:
R
e
m
ove usag
e
of
d
eprecate
d
Python "ha
s
_
key
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
Dav
i
d
Aguilar
dif
f
tool: F
i
x '--g
u
i' when dif
f
.
guitool i
s
unconf
i
gur
e
d
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
Da
v
id Aguilar
t7800-difftool
.
sh: Test mergetool
.
prompt fallback
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
David Aguilar
difftool: Update
copyrig
h
t not
i
ce
s
to list eac
h
y
e
ar
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
difftool: Use eval to expand '--extcmd' expressions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Ag
u
ilar
difftool:
A
dd '-x' an
d
a
s
an alias
f
o
r
'--extcmd'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Agui
l
ar
t7
8
00-difftoo
l
.
sh: S
i
mplify the --extcmd t
e
st
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
git-diff
.
t
x
t:
L
ink
t
o
g
it-difftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David A
g
uilar
difftool
:
Allow sp
e
c
i
f
y
ing unconfigur
e
d c
o
mmands with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
D
avid Ag
u
i
l
ar
difftool--help
e
r: Remove use o
f
the
G
IT_MERGE_TOOL
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Da
v
id Aguilar
difftool--helpe
r
: Update copyright and remove dis
t
racting
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
D
a
vid Aguilar
g
i
t-difft
o
ol: Add '--g
u
i' for select
i
n
g a
GUI tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
t7800-difftool: Set
a
bog
u
s
tool for use by tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
David
Aguilar
help: Do
n
ot unnece
s
sarily look for a rep
o
s
i
tory
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
David Ag
u
ilar
su
b
mod
u
l
e
.
c: Squelch a
"use
before assignment
"
warning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Da
v
i
d
Agui
l
a
r
d
i
ff:
generat
e
pretty
filenames in prep_temp
_
b
lob()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Da
v
i
d
Aguilar
compat: add a bas
e
name() com
p
atibi
l
ity function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
D
avid Aguilar
c
ompat:
add
a
mkste
m
ps() compatibility fun
c
t
ion
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguil
a
r
A
d
d
git-re
p
lace to
.
gitig
n
o
re
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
Davi
d
A
g
uil
a
r
m
ergetool--lib
:
add s
u
p
p
ort f
o
r araxis merge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
Da
v
id Agu
i
l
a
r
merg
e
t
ool--lib: specialize dif
f
o
p
t
i
o
n
s
f
or emerge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
D
a
vid A
g
u
ilar
mergetool--l
i
b: sim
p
lify
A
PI
usage b
y
removing more
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool/mergetool: refactor com
m
ands to use git
-
merget
o
ol
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
m
e
rgetool:
use $(
.
.
.
) instead of `
b
ackticks`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Agu
i
lar
b
a
sh co
m
p
letion: add git-diff
t
ool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Aguilar
difftool: add support for a dif
f
too
l
.
prompt c
o
nfig
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Aguilar
d
i
f
f
tool: add various git-dif
f
tool
t
es
t
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguila
r
difftool: move 'git-d
i
fftool' out of
contrib
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Agui
l
ar
difftool: ad
d
a -y shortcut for
-
-no
-
pr
o
mpt
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
i
d
A
g
u
ilar
difftool: use pe
r
l
built-ins when
t
es
t
ing for
msys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Agui
l
ar
difftoo
l
:
remove
t
h
e
b
a
c
kup file fe
a
ture
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
avid
A
guilar
difft
o
ol: remo
v
e
merge options for opendiff,
tkdiff
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
David Agui
l
ar
everyday: use
t
he dashless form o
f
git
-
init
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-12
D
avid Aguilar
contrib/difftool: u
s
e a separate
c
o
n
f
ig
n
a
mespac
e
for
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
David Aguilar
contrib/d
i
fftool: D
o
n't
r
ep
e
at merge t
o
ol c
a
ndidates
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next