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
difftool: support repositories with .git-files
2014-02-24
David Aguilar
diff
t
ool: s
u
pp
o
rt repositories w
i
th
.
git-files
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-21
David A
g
uilar
imap-
s
e
n
d: e
l
iminate
H
MAC deprecation warnings o
n
Mac
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-20
D
a
vi
d
A
g
uil
a
r
cache
.
h
:
elimi
n
a
t
e SHA-
1
dep
r
ecation warnings on Ma
c
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-20
David
Aguilar
Makefile: add
s
u
p
port for A
p
ple
C
om
m
onCr
y
pto facility
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-11
David
A
g
u
i
lar
Makefile: fix default regex s
e
ttings
o
n
Darwin
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-05-09
David Agu
i
l
a
r
m
e
rgetoo
l
s/kdiff3: do not use --auto when diffing
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-04-16
Da
v
id Aguilar
help
.
c: a
d
d a compatibili
t
y comment
t
o
cmd_version(
)
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
D
a
vid Aguilar
contrib/mw-
t
o-
g
it/t/ins
t
all-wiki
.
sh: use a lo
w
e
rcase
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
D
a
vid A
g
uilar
c
ontrib/examples/git-rem
o
t
e
.
p
erl: use a lowercase
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
tests: use
a
low
e
r
case "usage:
"
strin
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-25
Da
v
id
Aguilar
git-svn
:
use
a
lowercase "usa
g
e:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David
A
guila
r
D
oc
u
me
n
tatio
n
/user-m
a
nual
.
txt:
u
se a lowercase "usage
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David
A
guilar
templates
/
hooks
-
-
u
p
d
ate
.
samp
l
e: use a
l
o
wer
c
ase
"usa
g
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Agui
l
ar
co
n
trib/hooks/setgitperms
.
perl: use a
l
owerca
s
e "us
a
g
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Ag
u
ilar
contrib/ex
a
mples: use a lower
c
a
s
e
"usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d A
g
uilar
contri
b
/fast-i
m
port/import-zips
.
p
y: use spaces instead
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
cont
r
i
b
/
f
ast-import/im
p
ort-zips
.
py:
f
ix brok
e
n error
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Aguilar
c
o
ntrib/fas
t
-i
m
p
o
rt: use a low
e
rcase "usage:
"
s
tring
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
A
g
uilar
con
t
r
i
b/credential: use a lowercase "usa
g
e:" str
i
ng
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Agui
l
ar
git-
c
v
s
i
mport:
use a lowercase "usage:" st
r
i
n
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-cv
s
import: use a
lowercase "usage:" str
i
ng
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Agu
i
lar
git-cvsexpor
t
commit: use a lowercase "usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
A
g
uilar
g
i
t
-
archimport
:
u
se
a lo
w
e
r
case "u
s
age:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-merge-
o
ne-fi
l
e: us
e
a
l
ower
c
ase "usage:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Aguilar
git-re
l
ink: use
a
l
o
wercase "u
s
a
ge
:
" s
t
ring
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-svn: use a
l
owercas
e
"usage:" strin
g
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Aguilar
git
-
sh
-
setup: u
s
e a lowercase "usa
g
e:" string
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-21
David A
g
u
ilar
t7800: "defau
l
ts" is
n
o
l
onger a builtin tool n
a
me
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-21
D
a
vi
d
Aguilar
t7800: modernize tes
t
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-20
D
a
v
id
A
guilar
t7800:
u
pdate c
o
p
yri
g
ht notice
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-17
David Agui
l
ar
difftool: silence unin
i
tializ
e
d variable warning
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
David
A
guilar
p4merge: fix printf usage
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-10
David Aguilar
difftool--helper: fix printf usage
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
D
a
v
id Aguilar
doc: genera
t
e a list
of
v
a
l
id merge
tool
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-02-03
David Aguilar
mer
g
etoo
l
--lib: add functions for find
i
ng
av
a
i
lable
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David Ag
u
ilar
mergetoo
l
--lib: i
m
prove the
he
l
p
t
ext in
g
uess_merge_tool()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
David
A
gu
i
l
a
r
mergetool--lib: simp
l
i
f
y command exp
r
essions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-29
D
a
vid
A
g
uilar
mergeto
o
l
s
:
simplify
h
o
w
w
e
h
andle "v
i
m" and "de
f
aults
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
David A
g
uil
a
r
mergeto
o
l--lib: impro
v
e
show_tool_hel
p
(
)
o
u
tput
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2013-01-28
David Aguilar
merge
t
ools/v
i
m: remo
v
e redundant diff command
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-12-27
David Aguil
a
r
m
e
rg
e
too
l
s/p4merge: Honor $TM
P
DIR for the /
d
ev
/
null
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-10-11
David
A
guilar
m
e
r
getools/p4merge: Ha
n
dle
"/dev/null"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-25
David Aguilar
me
r
getool--
l
ib: Allow custo
m
commands to ove
r
ride built-ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
D
a
vid Agu
i
lar
g
i
t
k: Rename 'ta
g
cont
e
nts' to '
c
ach
e
d_tagcontent'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
David Aguilar
g
itk:
T
each "
R
eread re
f
erence
s
"
to reload tags
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-08-10
D
av
i
d
A
guilar
me
r
getool,dif
f
tool: Document -
-
tool-help co
n
sistently
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David A
g
u
ila
r
d
ifft
o
ol: Disable --symlinks on cygwin
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
dif
f
tool: Hand
l
e compar
e
()
returning -1
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
difft
o
ol: Wrap lo
n
g
lines fo
r
rea
d
ability
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
Davi
d
Aguilar
d
i
f
ftool: Ch
e
ck all return cod
e
s from compare()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
David Aguilar
difftool: H
a
ndle finding
m
erge
t
ools/ in a path with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Agu
i
la
r
difftoo
l
: Use sy
m
links when diffing against th
e
w
o
rktree
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
di
f
ftool: Call
t
h
e
temp directory "git-d
i
fft
o
ol"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftool: Move opt
i
on valu
e
s into a hash
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
dif
f
tool: Eliminate g
l
obal vari
a
bles
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
d
i
fft
o
ol: Sim
p
l
ify pr
i
nt_t
o
ol_help()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-03-19
David Aguilar
t780
0
: Test difftool p
a
ssing a
r
gum
e
nt
s
to dif
f
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-01-23
David A
g
uilar
mergetool:
Provid
e
an empty fi
l
e when needed
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-30
D
avid Aguilar
Mak
e
file: Impr
o
ve compil
e
r he
a
der de
p
e
n
dency c
h
eck
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
merget
o
ols/mel
d
: Use
'
--o
u
t
p
u
t' when
ava
i
lable
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David
A
guil
a
r
merget
o
ol--lib: Ref
a
ctor tools
i
nto separate files
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
mergetool--lib: Mak
e
style consistent wi
t
h git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
d
i
fftool--h
e
lper: Make sty
l
e co
n
sistent with
g
i
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-06-02
David Aguilar
t/t7
5
03-
p
re-commit-hook
.
s
h
: Add
G
IT_PREFIX
tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Aguila
r
git-m
e
rgetool--lib:
M
ak
e
vimdiff r
e
tain the curre
n
t
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
git: Remove ha
n
dli
n
g
f
or G
I
T_
P
REFI
X
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
D
avid Agu
i
l
ar
setup: Prov
i
de GIT_PREF
I
X to bui
l
t-ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
David Aguilar
submodule sync: Updat
e
"submodule
.
<name>
.
url
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-17
David A
g
uilar
merge
t
ool: Sk
i
p autoresolved pa
t
hs
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
David Aguila
r
Documentation: Expl
a
in
g
it-
m
erge
t
ool's use of temporary
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-29
D
avid Aguilar
Makefile: Remove usage of depre
c
ated Pyth
o
n "has_key
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-28
David
Ag
u
ilar
difftool: Fix '--gui' when
diff
.
guit
o
ol is unc
o
nfigured
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-23
David
Aguil
a
r
t7800-dif
f
tool
.
sh:
Test merget
o
o
l
.
prom
p
t fallback
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-16
D
avid Agui
l
ar
difftool: Upda
t
e
co
p
y
ri
g
h
t
n
oti
c
es to list each
year
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David
A
g
uilar
di
f
ftool: Use eval to expand '--extcmd
'
expr
e
ssions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
Da
v
id Aguilar
d
iff
t
ool: Add '-x' and as an al
i
as for '--extcm
d
'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
D
a
vid Ag
u
ilar
t
7800-difftool
.
sh: Simplify
t
he
-
-ext
c
md test
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Da
v
i
d
A
guilar
git-diff
.
txt: Link to git-difftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
dif
f
tool: Allow sp
e
c
i
fy
i
ng un
c
onfigure
d
c
ommands with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David A
g
u
i
lar
difftool
-
-help
e
r: Remove use of the
GIT_MER
G
E_
T
OOL
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
difftool
-
-helper: Updat
e
copyright and
r
e
m
o
ve
d
istracting
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
gi
t
-difftool: A
d
d
'
--gui' for selecting a GUI tool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
Da
v
id Aguilar
t78
0
0
-
difftool: Set a bogus to
o
l for use by t
e
s
ts
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
David
Aguilar
help: D
o
no
t
unnece
s
sarily l
o
ok for a repositor
y
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
David A
g
uilar
s
u
bmodul
e
.
c
: Sq
u
elch a "us
e
b
e
fore ass
i
gn
m
ent" warning
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
Da
v
i
d Agu
i
lar
d
i
ff: generate pretty file
n
a
m
es
i
n prep_temp_blob()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Agu
i
l
ar
compat: add a b
a
sename() compatibility function
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David A
g
uilar
co
m
pat: add a mkstem
p
s(
)
co
m
pa
t
i
b
i
lity f
u
nctio
n
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguil
a
r
A
d
d git-replace t
o
.
gi
t
ignore
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
Dav
i
d Agu
i
lar
merge
t
ool--lib: add support f
o
r arax
i
s
m
e
r
ge
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
Dav
i
d
Ag
u
ilar
merg
e
tool--l
i
b: spe
c
ial
i
ze diff options for
em
e
rge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
Da
v
id Agu
i
lar
mergetool
-
-
lib: simplify API usage by removing more
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Aguil
a
r
difftoo
l
/m
e
rgetool: refactor commands to use
g
i
t-mergetool
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Aguilar
mergetool:
use $(
.
.
.
) instead of `backt
i
cks`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
A
g
uilar
bash completion: ad
d
git-di
f
ftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
i
d
A
g
uilar
di
f
ftool: add support for a di
f
ftool
.
pr
o
m
p
t config
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Aguilar
d
i
f
f
too
l
:
a
d
d
various gi
t
-diff
t
ool tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Aguilar
difftoo
l
: m
o
ve 'git
-
difftool'
o
ut of contrib
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: a
d
d a -y
s
hor
t
cut f
o
r --no-promp
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: use perl built
-
in
s
when testing for
msys
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
next