repo.or.cz
/
git
/
jnareb-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
contrib/fast-import/import-zips.py: use spaces instead of tabs
2013-02-24
David
Aguila
r
contrib/fast-imp
o
rt/impo
r
t-zip
s
.
py: us
e
spac
e
s instea
d
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Ag
u
ilar
cont
r
ib/fast-impo
r
t/
i
mport-z
i
p
s
.
py: f
i
x broken error
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Aguilar
c
o
ntrib
/
fast-im
p
ort: use a
l
o
wercase
"
usa
g
e:
"
string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguila
r
co
n
trib/credential: use a lowercase
"
u
s
age:"
string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Agu
i
lar
git-cvsimpor
t
: u
s
e
a lowerc
a
se "usage:" strin
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Ag
u
ilar
git
-
cvsim
p
ort:
u
s
e
a
l
o
wer
c
ase "usage:" st
r
i
n
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Agui
l
ar
git-cvsexp
o
r
t
c
o
mmit
:
use a low
e
rcase "
u
s
a
ge:" str
i
n
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
u
i
lar
git-arch
i
mport: use a lowercase
"u
s
a
g
e:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
av
i
d Aguilar
gi
t
-me
r
ge-one
-
f
i
le: us
e
a
lowercas
e
"u
s
age
:
"
s
t
r
ing
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
gi
t
-relink: use a lowercase "u
s
age:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-svn: use a lowercase "usa
g
e:"
s
tring
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Agu
i
lar
gi
t
-sh-setup: use a lowercase "usage:
"
string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
David Aguilar
p4merge: fix print
f
usage
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
D
avid Aguil
a
r
dif
f
t
oo
l
--hel
p
er: fix pr
i
ntf u
s
age
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
David Agu
i
la
r
doc: generate a lis
t
of valid merge too
l
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
D
a
v
i
d
A
g
uilar
m
e
rgetool--lib: add functions for
f
inding available
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
Dav
i
d Ag
u
i
l
ar
mergetool
-
-lib:
i
mprove the help text
i
n
guess
_
merge_too
l
()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David A
g
uilar
mergetoo
l
-
-lib:
simplify c
o
mmand ex
p
ressions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David Ag
u
ilar
m
e
r
geto
o
ls
:
simplify how we handle "
v
im" and
"defaul
t
s"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
David
A
g
uilar
mergetool--li
b
:
improve sho
w
_
t
ool_help() output
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
David
Aguilar
m
er
g
etools
/
v
i
m: rem
o
ve redundant dif
f
comm
a
nd
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-12-27
David Aguil
a
r
mergetools/p4merge: Ho
n
or $TMPDIR fo
r
t
h
e /dev/null
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-10-11
David Aguilar
merge
t
ools/p4merge: Handle
"
/dev
/
null"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-25
David Agu
i
lar
merget
o
ol--lib:
Allow
custom comm
a
nds to overri
d
e bu
i
lt-i
n
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
David Aguilar
git
k
: Rename 'tag
c
ontents'
t
o
'ca
c
hed_tagconten
t
'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
David Aguilar
g
i
tk: Tea
c
h
"
R
eread references"
to reloa
d
tags
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-08-10
D
avid Aguilar
mergetool,difft
o
ol:
Document --tool-
h
e
l
p cons
i
s
t
ently
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
D
avid Aguila
r
di
f
ft
o
ol: Disable --symlinks on cygwin
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David Agu
i
lar
di
f
f
t
ool: Ha
n
dle com
p
are() returning -1
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David Aguil
a
r
difftool: Wrap lon
g
lines for
readability
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
D
a
v
id A
g
uilar
difftoo
l
: Check
a
l
l return code
s
from compare()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
David Aguilar
difftool
:
H
andle finding mergetools/ in
a path
with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
Davi
d
Aguilar
dif
f
t
o
ol: Use
s
ymlinks when
diffing against the work
t
ree
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftool: Call the t
e
mp direc
t
or
y
"
git-difftool"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David
Agui
l
a
r
difftool: M
o
ve
o
ption values into a hash
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David
A
g
uil
a
r
difftool: Eliminate global variables
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David
Agu
i
lar
d
ifftool: Sim
p
l
ify
p
rint_tool_help
(
)
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-03-19
David
A
guil
a
r
t7800: Test difftool
passing
argume
n
ts to diff
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-01-23
David Aguil
a
r
m
ergetool: Prov
i
de an empty
f
ile when needed
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-30
David Aguilar
Makefile: Impro
v
e
c
om
p
i
ler heade
r
dependency check
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
mergetools/mel
d
:
Use '--output' w
h
en available
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Agu
i
lar
mergetool--lib: Refactor
tools into separate files
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
Dav
i
d Agui
l
ar
m
e
r
g
etool--lib: Make style co
n
sistent w
i
t
h
g
it
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
D
a
vid Aguilar
difftool--helper: Make
sty
l
e consis
t
ent wit
h
git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-06-02
David Aguil
a
r
t/
t
7
503
-
pre-commit
-
hook
.
sh: A
d
d
GI
T
_PREFIX te
s
ts
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
Da
v
id
Aguil
a
r
git-mergetool--li
b
: Make
vimdiff r
e
tain
t
he
current
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
git: Re
m
ove handling fo
r
GIT_
P
REFIX
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
setup: Provi
d
e G
I
T_PR
E
FIX t
o
built-
i
ns
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
David Aguilar
submod
u
le s
y
nc: Update "s
u
bmodule
.
<name>
.
ur
l
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-17
D
a
vid
A
guilar
mergetool:
Skip auto
r
esolved paths
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
David Ag
u
i
lar
Documentation: Expla
i
n git-mergetool'
s
use of temporary
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-29
D
avid Aguilar
Ma
k
e
f
ile:
R
e
m
ove u
s
age of deprecated
Py
t
h
o
n "has_key
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-28
David Aguilar
difftool: Fi
x
'--gui' w
h
e
n diff
.
guit
o
o
l is
unco
n
figured
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-23
D
a
vid Aguilar
t7
8
00-d
i
fftool
.
sh: Test
mer
g
etool
.
promp
t
fallbac
k
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-16
David Agui
l
a
r
difftool: Update copyright notices
to list each year
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
di
f
ftool: Use eval
to
e
x
p
a
nd '--extcmd' expressions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
difftool:
A
dd '-x'
and
as an alias
f
or '--extcmd'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
Da
v
id Aguilar
t7800-difftool
.
s
h
: Sim
p
lify the
-
-
e
xtcmd t
e
st
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
D
a
vid Ag
u
i
lar
git-diff
.
txt: Link to g
i
t-d
i
fftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Agui
l
ar
d
i
fftool: Allow specif
y
ing
unconfigur
e
d c
o
mma
n
ds
with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
D
a
v
i
d Aguil
a
r
di
f
f
tool--h
e
l
p
er:
R
emo
v
e
u
se of the GIT_MERGE_
T
OOL
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Davi
d
Aguilar
difftool--hel
p
er: Updat
e
cop
y
rig
h
t a
n
d remove distractin
g
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David Aguila
r
gi
t
-difftool: Add '--gui
'
for
s
e
l
ecting a GUI t
o
ol
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
Dav
i
d
A
guilar
t7800-difftool: Se
t
a bogus tool for
u
se by tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
Dav
i
d
A
guil
a
r
help:
D
o
not unnecessarily look for a re
p
osit
o
ry
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
David Agu
i
lar
submodul
e
.
c: Squel
c
h a "use before as
s
ignment" warnin
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Agu
i
la
r
diff: genera
t
e pretty
f
i
len
a
mes in
p
rep_temp_blob()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David
Aguilar
c
o
mpat
:
add a b
a
senam
e
(
)
compatibi
l
ity funct
i
on
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David
A
g
uila
r
compat: add a mkstemp
s
() c
o
mpa
t
ib
i
lity functi
o
n
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Agui
l
ar
Ad
d
git-replac
e
to
.
gitignore
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
David Agui
l
ar
mergetoo
l
-
-
lib
:
a
d
d
suppor
t
for araxi
s
me
r
ge
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
D
a
v
i
d
A
guilar
m
e
rgetool--l
i
b
:
s
pec
i
alize diff options for
e
merge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
D
a
v
id Agui
l
ar
me
r
get
o
ol--
l
i
b:
s
imp
l
ify API usage by removing more
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
av
i
d Aguilar
difftool
/
merg
e
tool: ref
a
c
t
or commands to use git-
m
ergetool
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Aguilar
mergetool: use $(
.
.
.
)
instead of `backticks`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
A
g
uilar
bash completion
:
add
g
it-difftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: add support for a dif
f
tool
.
prompt
co
n
fig
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
A
g
uilar
difftool: add various git-difftool tes
t
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguil
a
r
d
i
f
f
t
o
ol: move 'g
i
t-
d
iff
t
ool'
o
ut of contrib
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Aguilar
difftool: a
d
d
a
-
y shortcut for --no-prompt
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool:
u
se perl built-ins w
h
en testing fo
r
m
sys
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
di
f
ft
o
ol: remove the backup
f
ile f
e
ature
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool
:
remove merge opti
o
ns for opendiff, tkdi
f
f
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-22
D
a
vid
Aguilar
everyday: use the dashle
s
s
f
orm of git-init
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-12
Da
v
i
d
A
g
uilar
contrib/difftool: use a separate config namespac
e
for
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-01
Dav
i
d Agu
i
lar
con
t
rib/di
f
ftool: Do
n
't repea
t
merg
e
tool candi
d
a
t
es
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David Ag
u
ilar
difft
o
ol: put the cur
s
or on t
h
e editable file for V
i
m
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
di
f
ftool: fix
d
ocu
m
entation pro
b
l
e
ms
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-18
Da
v
id Aguilar
c
o
ntrib: a
d
d
'git
difftool
'
f
o
r
launching c
o
m
m
on m
e
rge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-12-20
David Agui
l
ar
git-mer
g
etool
:
properly handle
"
g
i
t
merg
e
tool -- filen
a
m
e
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-03
David Aguila
r
tests: add a
testcase for "gi
t
sub
m
odule sy
n
c"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-26
David Aguilar
g
it-s
u
bmodule: a
d
d "sync" command
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-23
David Aguilar
g
i
t-submod
u
le: replac
e
du
p
licated code with
a
module
_
list
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-03-11
D
a
vid
A
g
uilar
[PATCH]
gitk: Don't show
l
o
c
a
l change
s
when
w
e
t
her
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree