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 'jk/t4205-cleanup' into maint
2016-07-26
David A
g
uilar
su
b
tre
e
: fix "git subtree split --r
e
j
oin"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-26
David Aguilar
t7900
-
subtree
.
s
h
: f
i
x quoting and broke
n
&& chains
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-05-16
David Agui
l
ar
difft
o
ol: h
a
ndle unmerged files in dir
-
diff mode
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-05-16
David Agui
l
a
r
difftool: i
n
itiali
z
e
var
i
ables
f
or readabilit
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-03-10
D
a
v
i
d Aguilar
m
erget
o
ol: honor
t
empfile co
n
figuration when reso
l
ving
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-03-10
David Ag
u
ilar
mergetool: support del
e
te/delete
con
f
licts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-10-29
D
avid Aguilar
di
f
ftool:
i
gnore
symboli
c
lin
k
s in use_wt_file
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-07-23
David
A
g
uilar
contrib/subtree: ignore log
.
date con
f
ig
u
r
a
ti
o
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
Dav
i
d Aguilar
merge
t
ools: add winmerge as a
builti
n
t
o
ol
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
David Agu
i
lar
m
ergetool
-
-lib: set
IFS for
difftool and m
e
rgetool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David Aguilar
mergetools: s
t
o
p
s
etting $status in merge_
c
md()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David Ag
u
ilar
m
ergetool
:
sim
p
lify con
d
itionals
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David Agui
l
ar
difftool--h
e
lper: add
explici
t
exit
statem
e
nt
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David Aguilar
mer
g
etool--lib:
r
emove us
e
of $status gl
o
bal
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-14
David
A
guilar
difftool
:
honor --tru
s
t-exit
-
c
o
de for builti
n
too
l
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-28
David Agui
l
ar
difftoo
l
:
a
dd
s
uppo
r
t
for --trust-ex
i
t-code
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
D
avid
Aguilar
t
7
6
10-mer
g
etool: a
d
d test cas
e
s fo
r
m
e
rge
t
ool
.
w
r
i
t
e
T
oTemp
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Ag
u
ilar
mergetool:
a
d
d
an o
p
t
i
on
for writi
n
g
to a
t
e
mporar
y
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
mergetool:
u
se more con
s
erva
t
ive tem
p
o
r
ary filenames
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
t
e
st-li
b
-f
u
nctions: adju
s
t
s
tyle to match CodingGuidelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
t7610-mergetoo
l
: use test_config to
i
solate tes
t
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David
A
guilar
mergetool
s
/me
l
d: make usage of `--output` conf
i
gurabl
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David
A
guila
r
git-sh-setu
p
:
move GI
T
_DIR initia
l
ization into a
f
uncti
o
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
mergetool:
u
se more co
n
servative temporary filenames
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David
A
g
u
i
lar
test-lib-functions: adjust styl
e
to match CodingGuidelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
D
avid A
g
uilar
t7610-merget
o
ol: prefer te
s
t_config ov
e
r git
config
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Ag
u
i
l
a
r
t7610-mergetool: add mi
s
sing && and
r
emove comment
e
d
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
Dav
i
d Aguilar
t7610
-
mergetoo
l
: use
t
abs instead of
a
mix
o
f ta
b
s
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-07
D
a
v
i
d
A
guilar
c
omplet
i
on
:
add --show-sig
n
ature for log and
s
how
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
Dav
i
d
A
guilar
s
t
ash: prefer --q
u
iet over she
l
l
r
edirection
o
f the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
Dav
i
d Aguilar
refs: make r
e
v-parse --qu
i
et actually
q
uiet
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-16
David Ag
u
ilar
t15
0
3: use te
s
t_mu
s
t
_be_empty
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
Davi
d
Aguilar
Document
a
tion: a note about s
t
dout f
o
r
git rev-parse
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
Da
v
id Aguilar
cleanups: ensure t
h
at git-co
m
pat-util
.
h is
i
ncl
u
ded
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-02
David Aguilar
stylefix:
a
s
terisks stick to the variable, not the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-27
D
avid Aguilar
gi
t
k: Catch mkdtemp errors
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
D
a
vid Aguilar
git
k
: Use mktemp -d
t
o avoid predictable
temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
David Aguil
a
r
gitk: Honor T
M
P
D
IR when vie
w
ing extern
a
l dif
f
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-02-24
David A
g
u
i
lar
difftool: s
u
pport r
e
positories with
.
git-file
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
Davi
d
Ag
u
ilar
pull: add
--f
f
-only
t
o the
h
elp text
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
David
A
guilar
pull
:
add pull
.
ff configuration
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-21
David Aguilar
imap-se
n
d:
e
l
iminate HMAC deprecati
o
n warnings on Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
Davi
d
Agui
l
ar
cache
.
h:
e
limina
t
e SHA-1 dep
r
e
c
a
t
io
n
warnings on
Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David Aguilar
Makefile: a
d
d su
p
p
ort for
A
pp
l
e
Comm
o
nCrypto fac
i
lit
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-11
David
A
gui
l
ar
Makefi
l
e: fix
default regex settings on
D
arwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-09
David Aguilar
mergetools/kd
i
f
f
3: do not use
-
-auto
w
h
en diffing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-04-16
Dav
i
d A
g
uil
a
r
he
l
p
.
c:
add a compatibility comme
n
t to c
m
d_vers
i
on()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David A
g
u
i
l
ar
c
ont
r
ib
/
m
w-t
o
-
g
it/t
/
install-
w
i
k
i
.
sh: use a lowerc
a
se
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguila
r
contrib/examples
/
g
i
t
-
r
emote
.
perl: use a lowe
r
case
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David
Aguilar
tests: use a lo
w
ercase "usag
e
:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
D
a
vid Aguilar
git-
s
vn: use a lo
w
ercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Aguilar
D
o
c
umentation/user
-
manual
.
txt: use a
l
owercase "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
template
s
/hooks--updat
e
.
sa
m
ple: use a lowercase "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid A
g
uila
r
contri
b
/hooks/setgitperms
.
p
e
rl
:
use a lowercase
"
u
sage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
c
ontr
i
b/exa
m
ples: us
e
a lowerca
s
e "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid
Aguilar
contrib/f
a
st-import/import-zips
.
py: u
s
e spaces i
n
stead
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Aguilar
c
o
ntrib/fast
-
import/import-zips
.
py:
fix broken erro
r
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d
A
guilar
contrib/fa
s
t-import: use
a lowerc
a
se "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Aguilar
contrib/cr
e
dential: use
a
low
e
rc
a
se
"us
a
g
e:" str
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-cv
s
impor
t
:
u
se a l
o
wer
c
ase "u
s
a
g
e:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Agui
l
ar
git-cv
s
import: use
a
lowerca
s
e
"
u
s
a
g
e
:
"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguil
a
r
g
i
t
-c
v
sex
p
ortco
m
mit: use a lower
c
ase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d
A
guilar
git-a
r
c
h
import: use a lowerca
s
e
"usage:"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-merge-one-file: use
a lowerc
a
se "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Ag
u
ila
r
git-r
e
link: use a lowercase "usage:" s
t
ring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-svn: use
a l
o
w
e
rcase "usage:"
s
t
r
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Aguilar
git-sh
-
s
etup:
u
se a lowercase
"usage:"
s
tri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
Davi
d
Aguilar
t
7800: "
d
efaults" i
s
n
o
l
o
nger a builtin tool nam
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David Aguilar
t
780
0
: modernize tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-20
D
a
vi
d
Agui
l
ar
t
7800: update
c
opyright notice
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-17
David A
g
uilar
diff
t
ool: s
i
lence uninitialize
d
variabl
e
w
a
rning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David
A
g
uilar
p4m
e
r
ge
:
f
i
x printf usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David A
g
uil
a
r
difftoo
l
--helper: fix
p
rintf usag
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David Aguilar
doc
:
generate a list of v
a
lid
mer
g
e
tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
D
a
v
i
d Aguilar
mergetool--lib:
a
dd func
t
ion
s
for
finding avai
l
able
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
m
e
rgetool--lib: improve the help
text in
g
u
e
ss_merge
_
tool()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David A
g
uilar
m
e
r
g
e
t
ool-
-
lib: simplify command expressions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Agui
l
ar
mergetools
:
si
m
plify h
o
w we handle "vim" a
n
d
"defaults"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
Davi
d
Aguilar
me
r
getool--lib: improve s
h
ow_tool_help() outpu
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
D
avid Aguilar
mergetools
/
vim:
r
em
o
ve red
u
ndan
t
diff command
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-12-27
D
a
vid A
g
uilar
mergetools/p4m
e
rge: Hon
o
r $T
M
PDI
R
for the
/
dev/nul
l
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-10-11
Da
v
id Aguila
r
mergetools/p4me
r
ge: Handle
"
/
dev
/
n
u
l
l
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
Dav
i
d
Aguilar
m
ergetool--lib: Allow custom
commands to o
v
e
rride built-
i
ns
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
Davi
d
Aguilar
g
itk: Rename '
t
agcont
e
nt
s
' to 'cac
h
ed_t
a
gcontent'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
D
avid Agu
i
lar
gitk: Teach "Reread references" to
r
el
o
ad
t
ags
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
David Ag
u
ilar
mer
g
e
tool,di
f
ftool: D
o
cum
e
nt --t
o
o
l
-help consistentl
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
Davi
d
Aguilar
difftool: Disable --sym
l
in
k
s on cygwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
dif
f
tool: Hand
l
e
c
ompare()
r
eturni
n
g
-1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
difftoo
l
: Wrap long lines for
r
eadability
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
Da
v
i
d
A
g
uil
a
r
diff
t
oo
l
:
Ch
e
ck all return c
o
des from compare()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David
Aguila
r
difftool: Han
d
l
e
finding mergetool
s
/ in
a path wi
t
h
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
D
avid Aguilar
difftool
:
Us
e
symlinks whe
n
diffing against the wor
k
tre
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftool: C
a
ll the temp directory "git-difft
o
o
l
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Agu
i
lar
d
ifftool: Move option valu
e
s i
n
to a
ha
s
h
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
d
i
fftool: Eliminate globa
l
variables
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftool: Sim
p
lify print_t
o
ol
_
h
e
lp()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
David Ag
u
ilar
t7800: T
e
st difftool passing arguments
t
o
di
f
f
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
David Aguilar
me
r
getool: Prov
i
d
e
an e
m
p
ty file w
h
e
n
needed
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
David Agui
l
a
r
M
a
ke
f
ile:
I
mp
r
o
ve comp
i
ler
h
eade
r
depende
n
cy check
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Agu
i
lar
mergetool
s
/me
l
d: Use '--output' wh
e
n
available
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next