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
do_fetch(): clean up existing_refs before exiting
2013-05-09
Davi
d
Aguilar
me
r
getools/kdiff3:
do not use --auto
w
hen diffing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-04-16
David A
g
uilar
help
.
c: add a compa
t
ibility comment to cmd_ver
s
ion()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David
A
g
uilar
co
n
trib/mw-to-git/t/install-w
i
k
i
.
sh: use a lowercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Agu
i
lar
c
ontrib/examples/g
i
t-remote
.
perl: use a
l
owerc
a
se
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguil
a
r
te
s
ts: use a lowercase
"usa
g
e:"
s
t
ring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
Da
v
id Aguilar
git-svn: u
s
e a lo
w
e
rcase "usage:" st
r
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Ag
u
ilar
D
ocumentat
i
on/u
s
er-m
a
nual
.
txt
:
use a lowercase "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Aguilar
tem
p
l
a
tes/hooks--update
.
s
a
mple
:
use
a
lowerc
a
se "
u
sag
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Ag
u
i
lar
contrib/hooks/setgitperms
.
perl
:
u
s
e a lowercase "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Ag
u
ilar
cont
r
ib/ex
a
mples: use
a
lo
w
ercase "us
a
ge
:
" stri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Aguilar
contrib/f
a
st
-
impo
r
t/
i
mport-zips
.
py
:
use spaces
instead
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Ag
u
ila
r
contrib/fast-import/import-zips
.
p
y
:
f
i
x
broken error
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
uilar
contrib/fast-import: use a lowerc
a
s
e
"usage:
"
st
r
i
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Aguila
r
c
o
ntrib
/
c
redenti
a
l: use
a
l
ow
e
rcase "usage:" str
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-cvsimpor
t
: us
e
a lowercase "usage:" strin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Agui
l
a
r
gi
t
-
cvsi
m
port:
use a
lo
w
ercase "usag
e
:" st
r
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Agu
i
lar
git-c
v
sexportcommit: use a low
e
rc
a
se
"
u
sage:"
s
tring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-archimpor
t
: use a
l
o
wercas
e
"usage:" st
r
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Aguilar
git-merge-
o
n
e-file: use
a
l
o
w
ercase
"
usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Aguilar
g
it-
r
e
l
in
k
: use a
l
ow
e
rcase
"
usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-svn: use
a
lowercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Ag
u
ila
r
git
-
sh-setup:
use a
l
owercase "
u
sag
e
:
" s
t
ring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David Aguilar
t7800: "
d
efa
u
lts" is no lon
g
er
a builtin tool name
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
Dav
i
d Aguilar
t7800: mode
r
nize
test
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-20
D
a
vid Aguilar
t7800: update co
p
yright notice
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-17
David Aguilar
difftool: si
l
ence u
n
ini
t
ialized vari
a
ble warning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
D
a
vid Agu
i
l
ar
p4merge:
f
ix printf usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David Aguilar
di
f
ftool--helper: fix printf u
s
age
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David Ag
u
ilar
doc: ge
n
erate a
list of valid merge to
o
ls
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
D
a
v
id Agui
l
ar
merg
e
tool--lib:
add
f
u
nc
t
ions for finding available
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Ag
u
i
lar
merg
e
tool--lib
:
improve
t
he help
t
ext in guess_merge
_
tool()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David
A
guilar
mergetool--lib: simp
l
if
y
comma
n
d expressio
n
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Ag
u
ilar
mergeto
o
l
s
: simplify how w
e
handl
e
"vi
m
"
and "defaults"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David Aguil
a
r
mergetool--lib: improve show_to
o
l_help() out
p
ut
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
Davi
d
Aguilar
m
ergetools/
v
im
:
remo
v
e redundant diff
command
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-12-27
David Aguilar
mer
g
et
o
o
l
s
/p4mer
g
e:
H
onor $TM
P
D
I
R for the /dev/
n
ull
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-10-11
David Aguilar
mergetools/p4merge: Ha
n
dle
"/d
e
v/null"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
Da
v
id Aguilar
merg
e
to
o
l--lib:
All
o
w custo
m
c
o
mma
n
ds to
o
verride
built-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David Aguilar
git
k
:
Rena
m
e '
t
agcontents' to 'cached_t
a
gc
o
n
te
n
t
'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
Davi
d
Aguilar
g
i
tk
:
Teach
"
Reread refere
n
ces"
t
o reload tags
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
Davi
d
Aguilar
mergetool,d
i
fftool: Document --t
o
ol-help
cons
i
stently
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
D
a
vid Aguilar
difftool: Di
s
abl
e
--symlinks on cygwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Ag
u
ilar
d
i
fftool: Handle compare() returni
n
g -1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
Dav
i
d Aguilar
difftool: Wrap long lines for readability
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David Aguil
a
r
dif
f
tool: C
h
eck all
r
et
u
rn cod
e
s
from
comp
a
re()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
D
a
vid Aguilar
difftool:
Hand
l
e find
i
ng mergetools/ in a pa
t
h
w
i
th
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
D
a
v
i
d
Aguilar
difftool:
U
s
e
symlinks when diffing
a
gainst the work
t
ree
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftool: Cal
l
the te
m
p d
i
r
e
cto
r
y "git-difftool"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Davi
d
Agui
l
a
r
diffto
o
l: Mo
v
e
opti
o
n
values in
t
o a hash
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Da
v
id A
g
uilar
di
f
ftool: Eli
m
inate glob
a
l
variables
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftool: Simp
l
i
f
y prin
t
_to
o
l_help()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
David A
g
uilar
t
7800:
T
e
st diffto
o
l passing
a
rgum
e
nts to diff
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
D
avid Aguilar
m
e
rgetool: Pro
v
ide
an empty
file wh
e
n needed
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
Davi
d
Aguilar
Ma
k
e
f
il
e
: Improve compiler header d
e
p
e
nd
e
ncy chec
k
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Da
v
id Aguilar
mergetools/meld
:
Use '--ou
t
put' when
available
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Dav
i
d Aguilar
mergetool--lib: Refactor to
o
ls i
n
to separa
t
e files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
D
a
vid Aguil
a
r
mergetool--lib
:
Mak
e
style
c
onsistent with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Agu
i
lar
d
i
ffto
o
l--helper:
Make
style cons
i
s
te
n
t with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
David
A
guilar
t/
t
7503-pre-co
m
mit-
h
ook
.
sh: Add GIT_PREFIX
t
ests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
D
a
vid Aguila
r
git-mer
g
etool--lib: Make
v
imdiff retain th
e
curr
e
nt
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
git: Remo
v
e
handling
for GIT_PREFIX
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
setu
p
:
Provide
G
IT_PRE
F
IX to built-
i
n
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
David Aguilar
subm
o
dule
sync
:
Update "submodule
.
<
name>
.
url"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-17
David Agu
i
lar
mergetool
:
Skip autoreso
l
v
e
d
p
aths
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
David Ag
u
ilar
D
o
cumentation: Explain git-mergetool's
use
o
f tempor
a
ry
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
Dav
i
d
A
guilar
M
a
kefile: R
e
mov
e
usa
g
e of deprecated Python "has_
k
ey
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
David Ag
u
ilar
difftool
:
Fix '
-
-gui'
w
he
n
di
f
f
.
guit
o
ol
is unconfigured
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
David Aguilar
t7800-difftool
.
sh: Test mergetool
.
pro
m
p
t fa
l
lback
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
D
avid Aguilar
dif
f
to
o
l: Update c
o
pyright notices to list e
a
ch year
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguila
r
difft
o
ol: Use eval to exp
a
nd
'
--
e
xt
c
md' e
x
p
ressions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
d
i
fft
o
o
l
: Add
'
-
x' an
d
as
a
n alias fo
r
'--extcmd'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
Da
v
id Aguilar
t7800-dif
f
t
oo
l
.
sh:
S
implif
y
t
h
e --e
x
tc
m
d test
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Agu
i
l
a
r
git-
d
iff
.
txt: L
i
nk
t
o
git-
d
ifftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Ag
u
ilar
difftool: Allow specifying unconfigured comman
d
s
with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Davi
d
A
guilar
difftool--helper: Remo
v
e
use of th
e
GIT_MERGE_TOOL
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David
Aguilar
difftool--he
l
per: Update cop
y
right and
r
emove dist
r
a
cting
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
Davi
d
Aguil
a
r
gi
t
-difftool: Ad
d
'--gui'
for sel
e
c
t
ing a GUI tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
t7800-difftool:
S
et a bogus tool for u
s
e by te
s
ts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
David Aguilar
he
l
p: Do n
o
t
unnecess
a
ril
y
look
f
o
r
a repos
i
to
r
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
Dav
i
d
Aguilar
submodule
.
c: Sque
l
ch a "use before as
s
i
g
nment" warning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
D
a
v
id Aguilar
diff: generate
pretty filenam
e
s in prep_temp_blob()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Davi
d
A
guila
r
compat: add a basename(
)
compa
t
ibili
t
y
function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Dav
i
d Aguila
r
compat: add
a mk
s
temps() c
o
m
patib
i
lity function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David
Aguilar
Add git-re
p
lace
t
o
.
gitignore
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
David Aguilar
mergeto
o
l--lib: a
d
d support for
ara
x
is
m
e
rge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
D
avid
A
g
uilar
mergetool--lib: s
p
e
c
ialize
d
i
ff opt
i
ons fo
r
emerge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
David Aguilar
mergetool--lib: simpli
f
y API u
s
age b
y
re
m
oving mo
r
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id
A
guilar
difftool/
m
erge
t
ool: refactor
comma
n
ds to us
e
g
it
-
merge
t
o
ol
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Aguilar
merget
o
ol: u
s
e $(
.
.
.
) i
n
stead of `
b
ac
k
t
i
cks`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id
A
g
u
ilar
ba
s
h
complet
i
on
:
add
g
it-dif
f
tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Agu
i
la
r
d
i
f
f
tool: add
support for
a
d
ifftool
.
prompt
c
o
nfi
g
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
il
a
r
difftool:
a
d
d various
git-difftoo
l
tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
di
f
ft
o
ol: move 'g
i
t-difftool' out of c
o
ntrib
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
A
guilar
difftool: a
d
d
a
-y short
c
ut
f
o
r -
-
no-
p
r
o
mpt
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Agu
i
la
r
difftool: use
p
erl
b
ui
l
t-ins when testi
n
g for m
s
ys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David A
g
uil
a
r
di
f
ftool: remove the backup file feature
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
A
gui
l
ar
difftool: re
m
ov
e
me
r
g
e options for
o
pendiff, t
k
diff
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
David
A
guilar
everyday: us
e
th
e
dashless form of g
i
t-init
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-12
Davi
d
Aguil
a
r
contri
b
/difftool
:
u
se a separat
e
c
o
n
fig namespac
e
for
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
D
a
v
id Agu
i
lar
con
t
rib/diff
t
ool
:
Do
n
't repeat m
e
rge tool candidate
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next