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
Merge branch 'maint'
2014-06-27
D
a
vid Aguilar
gitk: Catch mkd
t
e
m
p errors
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
David Aguilar
gi
t
k: Use mktemp -d to
a
void predi
c
table temp
o
rar
y
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
Da
v
id A
g
u
ilar
g
i
tk: Honor TMPDIR when viewing external diffs
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-02-24
Davi
d
Ag
u
ilar
dif
f
tool:
support
reposit
o
ries with
.
git-fi
l
es
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
David Aguilar
pull: a
d
d --ff-
o
nly t
o
the
help text
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
David
A
g
u
ilar
pull: a
d
d
p
u
ll
.
ff config
u
ration
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-21
Da
v
i
d Aguilar
imap-send: e
l
imina
t
e
H
MAC deprecation warnings on Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David Aguilar
cache
.
h: eliminate SHA-1 deprecation warnings on Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
D
a
v
id Ag
u
i
l
ar
Make
f
il
e
: add support for Apple Com
m
onCrypto facility
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-11
D
a
vid Agu
i
lar
Makefile: fi
x
d
e
fault regex settings on Darw
i
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-09
David Aguilar
mergetools/kdiff
3
: do
not
u
se --aut
o
when d
i
ffing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-04-16
David Aguilar
help
.
c:
add a
compatibility comment to cmd_version()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
contrib/mw-
t
o-git/t/install-
w
iki
.
sh: use a lowerca
s
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
con
t
rib
/
exa
m
ples
/
g
it-rem
o
t
e
.
perl:
u
s
e a lower
c
a
s
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David
Ag
u
i
l
ar
tests: use a
low
e
rcase "usag
e
:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguil
a
r
git-svn: use a lowercase
"
usag
e
:" s
t
ring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Aguilar
Doc
u
mentation/user-manu
a
l
.
txt: use a
l
ow
e
rcase "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vi
d
Ag
u
ilar
templates/hooks--up
d
ate
.
sample: use a lowercase "u
s
age
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contr
i
b/hooks/
s
etg
i
t
p
erms
.
p
e
rl: use a lowercase "
u
sag
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id A
g
uil
a
r
c
o
n
trib/examples: use a lowercase
"
usa
g
e:
"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid
A
g
u
ilar
contrib/fast-i
m
port
/
import-zips
.
py:
u
s
e
spaces
i
nstead
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contrib/fast-i
m
port/imp
o
rt-z
i
ps
.
py: fix bro
k
en error
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
guilar
contrib/fast-import
:
use a lowercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
av
i
d
A
guil
a
r
contrib/credenti
a
l: use
a
lo
w
ercase
"usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vi
d
Aguilar
git-cvsimpo
r
t:
u
s
e a lowercase
"
usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-cvsimpo
r
t: use a
l
owercase "usage:
"
s
tring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Agu
i
lar
git-cvsexportcommit: use a lo
w
ercase "usage:
"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Agui
l
ar
g
i
t-archimport: use a lowercase
"
usa
g
e
:
"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
v
i
d Agui
l
a
r
git-merge-o
n
e-fil
e
: u
s
e a lowerc
a
se "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Ag
u
ilar
git-
r
eli
n
k
:
use a lo
w
ercase "usage:
"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d
Agui
l
a
r
gi
t
-svn: use
a
lowerc
a
se
"usage:" st
r
i
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Agu
i
lar
git-sh-s
e
tup: u
s
e a lo
w
erc
a
se "usage:" stri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David
A
gui
l
ar
t
7800: "defaults"
i
s
n
o longe
r
a builtin tool
n
ame
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David Aguilar
t7800:
modernize test
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-20
D
av
i
d Aguilar
t78
0
0: upda
t
e copyright
notice
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-17
Dav
i
d
A
guil
a
r
d
i
fftool: silence
u
nin
i
t
i
a
lized variable
wa
r
ning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David Aguilar
p4
m
er
g
e: fix printf usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
D
a
v
i
d
Aguilar
dif
f
t
o
o
l--helper: fix pri
n
tf us
a
g
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David Ag
u
ila
r
doc: generate
a
l
ist of valid
merge
tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David Aguilar
mergetool--
l
ib: add funct
i
on
s
for
fin
d
ing availa
b
le
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
Davi
d
Agu
i
l
ar
m
ergetool--lib: im
p
rov
e
the help
text in
g
ue
s
s_merge_
t
ool()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
Davi
d
Aguilar
m
erge
t
ool--li
b
: simplify command e
x
pressio
n
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
mergetools: simpli
f
y
h
ow we handle "
v
im" and
"de
f
aults"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David Aguil
a
r
mergetool--li
b
: improve show_
t
o
o
l_help() output
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
Da
v
id Aguilar
mer
g
etools
/
vi
m
: remove redundant dif
f
command
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-12-27
D
a
vi
d
Ag
u
i
la
r
mer
g
etools/p
4
merge: Hon
o
r
$
TMPDIR for
t
he
/dev/null
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-10-11
D
a
vid Aguilar
mergetools/p4merge
:
Handl
e
"/d
e
v
/n
u
ll"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
David Aguilar
me
r
getoo
l
--lib: Al
l
ow cust
o
m comm
a
n
d
s to override
buil
t
-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David
A
guilar
g
it
k
: R
e
n
ame 'tagcontents' to 'cac
h
ed_ta
g
conte
n
t'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
Da
v
id
Agu
i
la
r
gitk:
T
ea
c
h "Reread r
e
ferences" to reload tags
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
D
avid Aguilar
m
erg
e
tool,diffto
o
l:
Docum
e
nt --tool-help consistently
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Agu
i
lar
difftool: Dis
a
ble --symli
n
k
s
on cygwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
D
avid
Aguilar
diff
t
ool: Ha
n
dle compare() returning -1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
D
a
v
i
d Aguilar
difftool: Wrap lo
n
g li
n
es
f
or readability
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David Aguilar
d
i
f
ftool: Check al
l
retu
r
n codes from compare()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David Aguilar
d
i
fftool: Handle finding mergetool
s
/
i
n a path with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftool: U
s
e symlinks wh
e
n diffing ag
a
inst
the wo
r
ktree
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David
A
guilar
difftool:
C
all t
h
e
temp directory "git-dif
f
to
o
l"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
D
a
v
id Agui
l
ar
diff
t
ool: Move option values into a
h
ash
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difft
o
o
l
:
Eliminate globa
l
variables
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
D
av
i
d Aguilar
di
f
ftool: Simplif
y
print_tool_he
l
p()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
Davi
d
Aguil
a
r
t7800: T
e
st difftoo
l
passing arguments to dif
f
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
D
a
v
id Aguilar
mer
g
etoo
l
:
P
r
o
v
ide an emp
t
y fil
e
when needed
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
Da
v
id Agui
l
ar
Make
f
i
le: Improve compiler
h
eader dependency che
c
k
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Agu
i
lar
merget
o
ols
/
meld: Use '
-
-output' when available
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Davi
d
A
g
uilar
merget
o
ol-
-
lib: Refactor tools in
t
o
sep
a
r
ate f
i
les
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
mergeto
o
l--
l
ib:
M
ake s
t
yle consistent with gi
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David
Aguilar
difftool--he
l
pe
r
:
Mak
e
s
tyle
consistent with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
David Aguilar
t
/t7503-p
r
e-com
m
it-hoo
k
.
s
h
: Add GIT_PREFIX
t
ests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David A
g
ui
l
ar
git-mergetool--lib: M
a
ke vimdiff
r
etai
n
the current
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David
A
guilar
git:
Remo
v
e handling fo
r
GIT_PREFIX
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Agui
l
a
r
setup: Pr
o
vide
GIT_PREF
I
X to buil
t
-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
David Agui
l
ar
s
ubm
o
dule syn
c
: Updat
e
"s
u
bmodule
.
<
name>
.
url"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-17
D
a
vid Aguilar
mergetool:
S
k
i
p autoresolved pat
h
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
David Aguilar
Documentation: Explain g
i
t-merget
o
ol's use of temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
David Agu
i
lar
Makefi
l
e: Remove
u
s
a
g
e
of deprecated Pytho
n
"has_k
e
y
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
David
A
guilar
difftool: F
i
x '-
-
gui' when
diff
.
guitool
i
s unconfigured
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
D
a
vid Aguilar
t7800-d
i
fftool
.
s
h:
T
est mergetool
.
p
romp
t
fallback
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
David Aguilar
difftool: Update copyright notices
to lis
t
each ye
a
r
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Agui
l
ar
d
i
fftool: U
s
e
eval to exp
a
nd
'--extcmd
'
expressi
o
ns
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
Dav
i
d Aguilar
diff
t
ool: Add '-x' and as an
a
lias for '--extcmd'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David A
g
u
ilar
t
7
8
00-difftool
.
sh: Simpl
i
fy the -
-
extcmd test
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
D
a
vid Aguilar
g
it-dif
f
.
txt:
Link
t
o git-difftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Da
v
i
d
Aguilar
diff
t
ool: Allow specifying u
n
con
f
i
g
u
red comman
d
s w
i
t
h
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
difftool--help
e
r: Remove use
o
f the GIT_MERGE_TOOL
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
D
avid Aguilar
difftool
-
-
helper: Update c
o
p
yright and
remove
distracting
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
D
avid Agui
l
ar
gi
t
-
d
if
f
t
ool: Add '--gui' for selectin
g
a
G
UI tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
D
a
v
i
d Agu
i
lar
t
7800-difftool: Set a bo
g
us tool fo
r
use by tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
David Aguilar
h
el
p
: Do not
unnecessarily lo
o
k
f
or a
r
e
pository
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
Da
v
id A
g
uilar
submodule
.
c: Squelch a "use b
e
fore
a
s
s
ig
n
ment" w
a
rning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Ag
u
ila
r
diff
:
ge
n
erate
pretty fi
l
e
n
ames in pre
p
_temp_blob()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David
A
guilar
com
p
a
t:
a
dd a
ba
s
e
n
am
e
() compatibility function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguila
r
co
m
pat
:
add
a
mkstemps() compa
t
i
bility
f
u
n
ction
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Agu
i
lar
Add git-rep
l
ace to
.
gitignore
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
David Aguilar
m
ergetool--lib:
a
dd support for araxis merge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
David
A
guilar
m
ergetool--l
i
b: specialize diff options
f
o
r
e
merge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
David Agu
i
lar
mergetool--
l
ib: simplify API us
a
ge by
r
em
o
ving more
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
A
guila
r
di
f
ftool/mergetool
:
r
e
factor commands to u
s
e git-mer
g
etool
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguila
r
mergetool: use $(
.
.
.
) inst
e
a
d
of `bac
k
tic
k
s`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
ilar
bash completi
o
n: add git-difftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next