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 'sb/t9300-typofix'
2014-09-19
Da
v
i
d
Aguilar
s
t
ash: prefer --qu
i
e
t
over s
h
el
l
redirectio
n
of th
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
D
av
i
d Aguil
a
r
refs: make
r
ev-parse --quiet actually quiet
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-16
David Agui
l
ar
t15
0
3: us
e
test_mu
s
t_be_empty
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
David A
g
uilar
Docu
m
entat
i
on: a note abo
u
t std
o
ut for git rev-parse
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-02
Davi
d
Aguil
a
r
s
t
yle
f
i
x: asterisks stick to the variable,
n
ot the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-27
David A
g
uilar
gitk
:
Catch mk
d
temp errors
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
D
av
i
d Aguila
r
gitk: Use mkte
m
p -d to avoid predicta
b
l
e
temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
David Aguilar
gitk: H
o
nor
T
MPDIR
w
hen
v
iewing external dif
f
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-02-24
David Aguilar
di
f
ftoo
l
: support reposit
o
r
i
es with
.
git-files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
David
A
gu
i
lar
pull: add -
-
ff-o
n
ly to the he
l
p
tex
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
Davi
d
Aguilar
pull
:
add pu
l
l
.
f
f
configuration
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-21
David
Aguilar
imap-s
e
nd: elimin
a
te HMAC depreca
t
i
o
n warni
n
g
s
on
Ma
c
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David
A
guilar
cac
h
e
.
h: e
l
i
min
a
t
e
SHA
-
1 deprecation warnings on Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
Davi
d
Aguilar
Ma
k
efi
l
e:
a
dd support for
App
l
e
C
o
mmonCryp
t
o facility
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-11
Dav
i
d
A
guilar
Makefil
e
: fix default regex
s
ett
i
ngs on Darw
i
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-09
David Aguilar
mergetools/kdiff3: d
o
not
u
s
e --auto
when diffi
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-04-16
David
Aguilar
help
.
c:
add a compatibility c
o
mme
n
t
to cmd_versio
n
()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
Davi
d
A
g
ui
l
ar
contrib/mw-t
o
-g
i
t/t
/
install-wiki
.
sh: use a low
e
rcase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David
Aguilar
contrib/e
x
a
m
ples/gi
t
-remote
.
perl: use a lower
c
ase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
Dav
i
d Aguil
a
r
tes
t
s
: use a lowercase "usa
g
e:" stri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David
Aguila
r
g
i
t-svn
:
u
se a lowe
r
case
"
usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Agui
l
ar
D
ocume
n
tation
/
user-manua
l
.
txt: use a lowerc
a
se "u
s
age
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
Agu
i
lar
templa
t
es/hooks--updat
e
.
sample: use
a lowercase
"
u
sag
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
c
o
n
trib
/
h
o
oks/s
e
tgitperms
.
perl: use a lowercase "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Aguilar
contr
i
b/examples: use a lowercase "us
a
ge:" strin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
v
id Agui
l
ar
contrib/fast-imp
o
rt/import
-
z
i
ps
.
py:
use sp
a
ce
s
instead
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contri
b
/fast
-
impor
t
/
i
mport
-
zips
.
py:
fix
brok
e
n error
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id
A
guil
a
r
contr
i
b
/
f
ast-import
:
use a lower
c
ase "usage:"
str
i
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid A
g
uilar
contrib/c
r
edential: use a
l
ow
e
r
c
ase
"usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Aguilar
git-cvsimport
:
use a lowercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Ag
u
ilar
git-c
v
simpor
t
: use a lo
w
ercase "u
s
age:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
g
it-
c
vs
e
xp
o
rtcommi
t
: use
a lowercase "u
s
age:"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
g
uilar
git-arch
i
mport:
u
s
e a
lowercase "usage:"
s
tring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-mer
g
e-one
-
file:
use a lowerc
a
s
e
"usag
e
:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguil
a
r
g
it-relink: use a lowe
r
case "usage:" st
r
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguila
r
git-svn
:
use
a
lowercas
e
"
u
s
a
ge:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
v
i
d Aguilar
git-sh-setup: use a lowercas
e
"
u
sage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David
Agui
l
ar
t7
8
00: "defaults"
i
s no
longer a b
u
ilti
n
too
l
name
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
D
a
vid Aguilar
t7800: moder
n
ize tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-20
D
avid Aguila
r
t7800: upd
a
te copyrigh
t
notic
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-17
David Aguilar
difftool: si
l
ence uninitialized vari
a
b
le warning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
D
a
vid Aguila
r
p4merge: fix pr
i
ntf usag
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
D
avid Aguila
r
dif
f
tool--h
e
lpe
r
:
fix prin
t
f u
s
age
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David Aguila
r
doc:
g
enerate a list of valid
mer
g
e tool
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David Ag
u
ila
r
m
e
r
g
e
tool--lib: add
f
uncti
o
ns for finding available
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
D
a
v
i
d
A
g
uilar
m
e
rgetool-
-
lib: improv
e
t
h
e help text i
n
guess_merg
e
_tool()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David
A
guilar
merg
e
tool--lib: s
i
mplify command e
x
pressions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
Davi
d
Aguilar
merge
t
ools: simplify how we han
d
le "vim"
a
nd
"
defaults"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David Aguilar
mer
g
etoo
l
-
-lib: improve
show_
t
ool_h
e
lp() output
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David Ag
u
ilar
merg
e
tools/vim: remove
r
edu
n
d
a
nt dif
f
comman
d
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-12-27
David Aguilar
merge
t
o
ols/p4merg
e
: Honor
$
T
MPDIR f
o
r th
e
/dev
/
null
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-10-11
David
A
g
uilar
m
e
rg
e
tools/p
4
merge: H
a
ndle "/de
v
/null
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
D
avid Ag
u
ila
r
mergetool
-
-lib: Allow custom
c
ommands
t
o over
r
ide built-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David Aguilar
gitk: Rena
m
e 'tagcontents' to 'cached_t
a
gco
n
ten
t
'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
Da
v
id Aguil
a
r
git
k
:
Teac
h
"Reread references" to r
e
loa
d
t
a
gs
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
Dav
i
d
Aguilar
mergetool,difft
o
o
l: Document -
-
t
o
ol-hel
p
co
n
sist
e
n
t
l
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
D
a
v
id Aguilar
difftool: Disab
l
e -
-
symlinks on cygwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
d
iffto
o
l:
Handle compare() return
i
ng -1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
D
a
vid
A
guil
a
r
difftool: Wrap long lin
e
s for readability
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David Aguilar
difftoo
l
:
Che
c
k all return codes from
compare()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David Aguilar
difftoo
l
: H
a
ndle
findi
n
g me
r
get
o
o
ls/ in a path with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguila
r
di
f
ftool:
U
se symlink
s
w
hen diffi
n
g ag
a
inst the worktree
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftool: Cal
l
the temp directory "g
i
t-
d
ifftool"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
d
i
fftool: Move option values into a h
a
sh
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Agu
i
lar
difftoo
l
: Eliminate global variables
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Ag
u
ilar
difftool: Simplify print_t
o
ol_help()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
Da
v
id Aguilar
t
7800: Tes
t
difftool passing
a
rguments
to
d
iff
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
David Agui
l
ar
me
r
getool: Provide a
n
em
p
ty file wh
e
n needed
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
D
avid Aguilar
Makefile: Improv
e
compi
l
er header dependency check
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
D
avid Aguila
r
me
r
getools/
m
e
l
d
:
U
s
e '--output' w
h
en availa
b
le
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Da
v
id
Aguilar
mergetool--lib:
Refa
c
tor to
o
ls into separa
t
e fil
e
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David
Agu
i
lar
m
ergetool--lib
:
M
a
ke style c
o
nsistent
w
it
h
git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
difftoo
l
--helper: M
a
ke
style consistent with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
David Aguila
r
t
/t7503-pre-c
o
mmit-hook
.
sh: Ad
d
GIT_PREFIX tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Agui
l
ar
git-
m
erg
e
t
ool-
-
li
b
: Make vimdiff
r
etain
the c
u
rrent
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David
A
guilar
gi
t
: Remove handling for GIT
_
PREFIX
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
setup
:
Provide GIT_PREFIX t
o
built
-
in
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
David Ag
u
i
lar
subm
o
d
ule sync: Update "
s
ubmodule
.
<name>
.
url"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-17
David Agu
i
lar
mergetool:
Skip aut
o
r
esol
v
ed paths
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
David Aguilar
Documentation: Ex
p
l
ain git-merg
e
tool's us
e
of temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
Davi
d
Aguilar
Makefile:
R
e
move usage
of depr
e
ca
t
ed Python "has_key
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
David Aguilar
difftool: Fix '
-
-gui' when diff
.
gui
t
o
o
l
is un
c
on
f
igured
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
Da
v
id Ag
u
ilar
t780
0
-
difftool
.
sh: Test me
r
getool
.
p
r
o
mpt
f
a
l
lback
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
David Aguil
a
r
diff
t
oo
l
:
U
pdate cop
y
right notices to list each yea
r
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
difftoo
l
:
Use eval to expand '--extcm
d
' expressi
o
n
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
D
avid Aguilar
d
ifftoo
l
:
Add '-x'
and
a
s
an
alias for '--ext
c
md'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
D
a
v
id Ag
u
ilar
t7800
-
d
ifftool
.
sh
:
Simplify the --extcmd tes
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Davi
d
Aguilar
git-diff
.
txt: Link to gi
t
-
diff
t
ool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
difftool: A
l
low specifyi
n
g
uncon
f
i
g
ured commands with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
D
avid
A
gui
l
ar
difftool--helper: R
e
m
o
ve use of the GIT_MERGE_TOOL
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
D
avid Aguilar
difftool--
h
el
p
er: Update copyrig
h
t and remove
d
i
str
a
cting
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
Davi
d
Ag
u
ilar
g
i
t-dif
f
tool
:
A
d
d '--gu
i
'
fo
r
selecti
n
g
a
GUI tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
t7800
-
difftool: Set a bog
u
s tool for
u
s
e
by te
s
ts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
David A
g
uil
a
r
help: D
o
not unnecessarily look for a re
p
ository
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
D
a
vid Agu
i
lar
submodu
l
e
.
c: Squelch
a "
u
se before
assignment"
warn
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Dav
i
d
Agu
i
lar
d
iff: gene
r
ate pretty filename
s
in prep_temp_bl
o
b
()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David
A
guilar
compat:
a
dd a basename() compatibi
l
it
y
function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
D
avid Agu
i
l
a
r
compat: add a mkstemps() compa
t
ibility fu
n
ction
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Agui
l
a
r
Add git-replac
e
to
.
gi
t
ign
o
re
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
D
a
vi
d
Aguila
r
merg
e
tool--lib: add s
u
pport for ara
x
is merg
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next