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
comments: fix misuses of "nor"
2014-02-24
D
avid Agu
i
lar
diffto
o
l: su
p
port repositories with
.
git-files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-21
D
a
vid Agui
l
ar
imap-s
e
nd: eliminate H
M
AC dep
r
e
cation w
a
r
n
i
n
gs
on
M
ac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David
A
guilar
c
ache
.
h: e
l
iminate SHA-1 deprecation wa
r
ni
n
gs on Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David Aguilar
Makefil
e
: add suppo
r
t
for Apple Com
m
onCrypto fac
i
l
ity
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-11
Da
v
i
d
A
guilar
Make
f
ile: fix def
a
ult regex settings on Darwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-09
David Aguilar
mer
g
et
o
ols/kdif
f
3: do
not u
s
e --auto
w
he
n
diffing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-04-16
Dav
i
d Agu
i
lar
h
elp
.
c
: add a compatibil
i
t
y
comment to
c
m
d_ve
r
s
i
on()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
contrib/mw-to-git/t/install-wiki
.
sh:
u
s
e a lowerc
a
se
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
co
n
tri
b
/exampl
e
s/git-rem
o
te
.
pe
r
l: use a lo
w
ercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
Dav
i
d
A
gu
i
la
r
test
s
: us
e
a
lowerc
a
se "
u
s
a
g
e:" str
i
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
D
a
vid Aguilar
g
i
t-svn:
use a lowercase "usage:" stri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
D
o
cument
a
tion/user-manual
.
txt: use a lowercas
e
"usag
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Aguilar
temp
l
a
tes
/
h
o
oks--
u
pdate
.
sample: u
s
e
a lowerca
s
e
"usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
guil
a
r
contrib
/
hoo
k
s/s
e
tgitperm
s
.
pe
r
l
:
use a
l
owercase
"
usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid
Aguil
a
r
co
n
trib/exam
p
les: u
s
e
a
lowercase
"us
a
ge:" s
t
r
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguila
r
contr
i
b/f
a
st-im
p
ort
/
im
p
ort-
z
i
p
s
.
py: use spac
e
s i
n
s
tead
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguila
r
contrib/fast-
i
mport/i
m
port-z
i
ps
.
py: fix brok
e
n erro
r
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Aguilar
contrib/fast-import: us
e
a lower
c
ase "usage
:
"
stri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Ag
u
i
lar
contrib/creden
t
ial:
use
a lowercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Aguilar
git-cvsimport
:
u
s
e a
l
owe
r
c
a
s
e
"usage:" str
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
ui
l
ar
git-cvsimp
o
rt: use
a
l
o
w
e
rcase
"
usage:" stri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
guilar
git-cvsexportc
o
mmit:
use a lowerc
a
se "u
s
age:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
uil
a
r
git-archimport: use a lowercase
"usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Ag
u
ilar
g
it-merge
-
one
-
file: us
e
a lowe
r
ca
s
e "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Agui
l
ar
gi
t
-relink: use a l
o
wercase
"
usage:"
s
t
ring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Aguilar
gi
t
-svn: use
a
lowercase "usage:" st
r
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
Aguilar
gi
t
-
s
h
-
s
e
t
up:
u
se a lower
c
ase
"us
a
g
e
:" str
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
D
avid Ag
u
ilar
t7800: "de
f
a
u
lts
"
is no longer a builtin tool name
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
Dav
i
d
Agui
l
ar
t7800: modernize test
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-20
Davi
d
A
g
uilar
t780
0
:
u
p
date copyright
n
otice
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-17
Dav
i
d Aguilar
difftool: s
i
lence unini
t
ia
l
ize
d
variab
l
e warning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David Aguilar
p4merg
e
: fi
x
prin
t
f usag
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
Dav
i
d
Aguilar
d
ifftool--helper
:
fix print
f
usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
D
a
vid Aguilar
doc: g
e
n
erate a list o
f
vali
d
m
e
rge tool
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David Aguilar
mergetool--lib:
add f
u
nctions for f
i
n
d
ing
available
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
Dav
i
d Agui
l
ar
me
r
g
e
tool--l
i
b
: imp
r
ove the help text
i
n guess_merge
_
t
ool()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
Da
v
id Aguilar
mergetoo
l
-
-l
i
b: simp
l
i
f
y
comma
n
d expressions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Aguil
a
r
mergetools
:
si
m
plify h
o
w we
h
andle "
v
i
m
" and "defaults
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
Dav
i
d Aguilar
mergetool--lib:
i
mprove s
h
ow_tool_help() output
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
D
a
vid Agu
i
lar
m
e
r
getoo
l
s/vim
:
rem
o
ve redundant diff command
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-12-27
Davi
d
Aguilar
merg
e
t
o
o
l
s/p4mer
g
e: Honor $TM
P
DIR
f
o
r
th
e
/dev/null
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-10-11
David Aguil
a
r
merg
e
tools/p4merge: H
a
ndle "/dev/n
u
l
l
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
D
avi
d
Aguilar
mergetool--lib: Allo
w
c
u
s
tom co
m
m
ands to o
v
errid
e
built-
i
ns
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David A
g
uil
a
r
gitk: Rename
'tagcont
e
nts'
to 'ca
c
hed_t
a
gcontent'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David Aguilar
gitk
:
Te
a
ch "Reread refer
e
nces" to reload tags
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
D
a
vid Aguilar
mergetool,diff
t
ool
:
Document --too
l
-help consistent
l
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David A
g
uilar
difft
o
ol: Disable
--symlinks
o
n cygwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguila
r
difftool: Handle compare() returning -1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
difftool: Wrap l
o
ng l
i
nes for
readabilit
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David Ag
u
ilar
difftool: Check al
l
r
e
t
u
r
n
c
odes from
c
ompare()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
D
a
vid Aguilar
difftool: Handle finding mer
g
e
tools
/
in a pat
h
with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David
Aguila
r
difft
o
ol: Use sym
l
i
n
ks wh
e
n diffing against the worktree
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Ag
u
ilar
difftool: Ca
l
l the temp directory "git-difftool"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David
Aguilar
d
if
f
tool: Move option values
i
nto a ha
s
h
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Ag
u
ilar
difftool: El
i
m
inate global variables
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Dav
i
d
Aguilar
difftool:
Simplify pr
i
n
t
_tool_hel
p
()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
D
a
v
id Aguila
r
t7800: Test diff
t
o
ol passin
g
arg
u
ments to diff
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
David Aguilar
merg
e
tool: Provi
d
e an empty fil
e
when n
e
eded
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
David Aguil
a
r
M
akefile:
I
mprove
compiler hea
d
e
r dependen
c
y check
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
merge
t
ools/meld:
Us
e
'--o
u
tp
u
t' when available
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David A
g
u
ilar
mergetool--
l
i
b: Refactor
t
ools into separate files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
D
avid Agui
l
ar
merg
e
t
ool--lib: Make st
y
le consistent with g
i
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguil
a
r
di
f
ftool--h
e
lper: Make
style cons
i
st
e
nt with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
D
avid Aguilar
t/t7503-pre-commit-hook
.
sh: Add GIT_
P
REFIX tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David
A
guilar
gi
t
-me
r
get
o
o
l
--l
i
b: Make vimdiff
r
etain t
h
e cur
r
ent
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Ag
u
ilar
git: Rem
o
ve handl
i
n
g
for
G
IT_PREFIX
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
Da
v
i
d Agui
l
ar
setup: Provide G
I
T_PREFIX
t
o built-in
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
David Aguilar
s
u
b
mod
u
le sync: Update "su
b
module
.
<n
a
me>
.
url"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-17
D
a
vid Agui
l
ar
mer
g
etool: S
k
ip a
u
toresolved paths
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
David Aguilar
D
ocum
e
nta
t
ion: Explain git-mer
g
eto
o
l's use of
t
emporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
Da
v
id Aguilar
Makefile: Remo
v
e usage of
d
eprecated
Pytho
n
"
h
as_key
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
David Aguilar
di
f
f
t
ool
:
Fix '--gui' when
d
i
f
f
.
guitool
is uncon
f
igured
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
Da
v
id
A
gu
i
l
a
r
t7800
-
d
ifftool
.
s
h
: Test
mergetool
.
p
r
o
m
p
t
fallback
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
David Aguila
r
difft
o
o
l
:
Upda
t
e copyright notices to list each year
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Agui
l
ar
d
i
f
ftool: Use eval t
o
expand '--extcmd' expressio
n
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
Dav
i
d
Aguilar
difftool: A
d
d '-x' and as an alias for '--
e
xtcmd'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
t7800-diff
t
ool
.
s
h
: Simpl
i
f
y the -
-
extcmd test
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
git-
d
iff
.
txt: Link to git-difftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
d
i
fftoo
l
: Allow speci
f
y
in
g
unconfigured command
s
with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
D
a
vid Aguilar
difftool--
h
elpe
r
:
R
e
m
ove
use
o
f the
GIT_MERGE_TOOL
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David A
g
ui
l
ar
dif
f
to
o
l--helper: Up
d
a
te co
p
y
right and remove
distracting
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David Agui
l
a
r
git-difftool: A
d
d '--gui' for selecting a GUI tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David
A
guilar
t
7800-
d
ifftool:
S
et a
bogus tool
f
or
u
se by
t
ests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
David Agu
i
lar
he
l
p: D
o
not
u
nnecessa
r
ily look for
a
repository
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
D
avid
Aguilar
s
u
b
m
odule
.
c:
Squ
e
l
c
h a "use b
e
fore assignmen
t
"
w
ar
n
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David A
g
ui
l
a
r
diff:
generate pretty filenames in
p
rep_
t
e
m
p_blob()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
c
o
mpat: add
a
b
a
sename() compati
b
ility
func
t
ion
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David
Aguilar
co
m
pat: a
d
d a mkstem
p
s() c
o
mpat
i
bility function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Da
v
id Agui
l
ar
Add git-rep
l
ace
to
.
g
i
t
i
gnore
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
David Aguilar
merg
e
tool-
-
lib: add support
for araxis me
r
ge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
Dav
i
d
Aguilar
mergetool--l
i
b: specia
l
ize diff options f
o
r
e
m
erge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
D
avid Aguilar
me
r
ge
t
oo
l
--li
b
:
si
m
pl
i
f
y
API usage by rem
o
vi
n
g more
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David A
g
uilar
difftool/m
e
rgetool
:
refactor comm
a
nds to use git
-
mergetool
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Aguilar
mer
g
etool: use $(
.
.
.
) instead o
f
`ba
c
kticks`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
Agu
i
lar
bash comple
t
ion: add g
i
t-difft
o
ol
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
i
l
ar
difftool: add
support for
a
dif
f
t
ool
.
prompt confi
g
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Aguil
a
r
dif
f
tool: add various git-diffto
o
l tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguila
r
diff
t
o
o
l: move 'g
i
t-difftool' out of con
t
rib
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Aguilar
difftool: add a -y shor
t
cut
for --no-
p
rompt
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
di
f
fto
o
l: use perl built-ins when testing for msys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next