repo.or.cz
/
git
/
raj.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/doc-unify-bottom'
2017-02-08
David Agu
i
lar
t7800: r
e
place "wc -l" wit
h
test_line_co
u
n
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-02-08
D
a
vid Ag
u
i
l
ar
t7800:
simplif
y
ba
s
ic usa
g
e te
s
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-02-06
David Aguilar
d
if
f
tool: fix bug when p
r
in
t
ing
u
sage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-01-18
D
a
vid Aguilar
gi
t
k: R
e
m
ov
e
t
r
a
nslate
d
messag
e
from comment
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
David A
g
u
i
lar
me
r
getools: f
i
x xxdiff hotk
e
ys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
David
Aguilar
diff
t
o
o
l: rena
m
e variables for
co
n
sistency
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
David
A
gu
i
lar
d
i
fftool: chdir
a
s ear
l
y as possible
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
David Aguilar
difftool: san
i
t
i
ze $workdir a
s
e
a
rly a
s
p
os
s
ible
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
Da
v
id
Ag
u
i
l
ar
difftool:
fix dir-diff index c
r
ea
t
ion when
i
n a subdirectory
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-08
David Aguilar
difftool: fix dir-diff index c
r
eation w
h
en in a
subdirector
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-11-29
D
avid Aguilar
merget
o
ols/vimdiff: tr
u
st
Vim's exit cod
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-11-29
D
avid Aguilar
mergetool:
h
onor m
e
rgetool
.
$tool
.
trustE
x
itCode
f
o
r
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
David Aguilar
merge
t
ool: honor -O<orderfile>
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
David Aguilar
mergetool:
honor diff
.
orderFile
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
David Aguilar
merg
e
t
o
o
l
:
move main progra
m
f
low
i
nto a mai
n
() function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
D
avid Agui
l
a
r
mergeto
o
l: add cop
y
right
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
David Aguilar
difftool: use
Git::*
f
unctions
i
nstea
d
o
f
passin
g
ar
o
und
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
David
Aguilar
d
i
fftool: avoid
$GIT_DIR and $GIT_WORK_TREE
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
David Agu
i
lar
subtree: adjust
f
unction definitions to match Co
d
in
g
Guidelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
David Aguilar
subtree:
a
djust
sty
l
e
t
o m
a
tch
C
odingGuidelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-26
David Aguilar
subtree
:
fix "git
s
u
b
tree split --re
j
oin"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-26
D
avi
d
Aguilar
t
7
9
00-su
b
tre
e
.
sh: fix q
u
o
ting and broken && chains
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-05-16
David Agu
i
l
ar
difftool:
h
andle unme
r
ged files in dir-
d
iff mo
d
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-05-16
David Aguil
a
r
difftool: initialize varia
b
les for
r
ea
d
ab
i
lity
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-03-10
David Aguilar
merge
t
o
ol: honor tempfile con
f
iguration when reso
l
ving
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-03-10
Davi
d
Aguilar
me
r
getool
:
support de
l
ete/
d
el
e
te conflicts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-10-29
David Ag
u
ilar
dif
f
tool: ignore symbolic
links
in use_wt_file
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-07-23
Dav
i
d Ag
u
i
l
ar
c
o
ntrib/subtre
e
:
i
g
n
o
r
e
log
.
date configuration
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
Dav
i
d
Aguilar
m
ergetools: add winmerge as a buil
t
in tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
David Aguilar
merget
o
o
l
-
-
lib
:
set
I
FS for difft
o
ol and merget
o
ol
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David Aguilar
mergetools: stop s
e
tting $status in m
e
rge_
c
md()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
D
a
vid Aguilar
mergetool: si
m
p
l
ify condition
a
ls
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
D
a
vid Aguilar
difftool--helper
:
add explicit exi
t
statement
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
Dav
i
d
A
guilar
mergetool
-
-lib: r
e
move use of $status
g
lobal
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-14
Dav
i
d A
g
uilar
difftool: honor -
-
trust-exit-c
o
de for
b
uiltin
t
ools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-28
Dav
i
d Aguilar
di
f
ftoo
l
: add support for --tru
s
t-exit-
c
ode
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
D
a
vid Ag
u
ilar
t761
0
-me
r
getool: ad
d
test cases for
m
e
rgetool
.
writeToTem
p
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Agu
i
la
r
mergetoo
l
: ad
d
an option
f
or writing t
o
a temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
mergetool: use more co
n
s
e
r
va
t
ive temporary filen
a
m
es
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
D
a
vid
A
g
u
ilar
test-li
b
-func
t
ions:
a
d
just st
y
l
e
to match Co
d
i
ngGui
d
e
l
ines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
t
7
610-mergetool: use test_config to i
s
olat
e
tes
t
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Agu
i
l
ar
mergetools/me
l
d: make usage of `--out
p
ut` configurable
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
D
avid Aguilar
git-sh-set
u
p:
m
ove GIT_DIR ini
t
ializa
t
ion i
n
t
o
a function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
mergetoo
l
: use
more conservat
i
ve temporary filenames
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David
A
guilar
t
e
st-
l
ib-functions: adjust
s
tyle to ma
t
ch Codin
g
Guid
e
lines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
Dav
i
d Aguilar
t7610-mergeto
o
l
: prefer te
s
t_config over g
i
t config
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
D
a
vid Aguilar
t
7610-mergetool: ad
d
missin
g
&&
a
n
d remove commented
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
Da
v
id
A
g
ui
l
ar
t7610-mergetool
:
u
se tabs ins
t
ead of a mix o
f
t
abs
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-07
David Aguil
a
r
completion:
add --show-
s
ignatu
r
e for log
and show
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
David Ag
u
ilar
s
tash: prefer --qu
i
et
ove
r
she
l
l redirection of the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
Davi
d
Aguilar
refs: make rev-pa
r
se
--quiet act
u
a
l
ly quiet
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-16
David Aguilar
t1503: use test_must_be_empty
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
David Agu
i
lar
Docu
m
e
n
tation: a note
a
b
out stdout f
o
r
git rev-parse
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
David Aguil
a
r
c
lea
n
ups:
e
ns
u
re that git-
c
ompat-ut
i
l
.
h is included
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-02
David Aguilar
s
ty
l
efix:
a
ster
i
s
k
s
stic
k
to th
e
variable, not th
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-27
Da
v
id
Ag
u
ilar
gitk: Catch mkdt
e
m
p
errors
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
David
A
guilar
gitk:
U
se mktemp -d to avoid predicta
b
le
tempora
r
y
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
D
avid Aguil
a
r
gitk: Ho
n
or TMPDIR when viewing e
x
ternal diff
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-02-24
D
a
vid A
g
u
i
lar
diff
t
o
ol: support r
e
positories
w
ith
.
git-f
i
les
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
David Aguila
r
pu
l
l:
a
d
d --ff
-
only to
t
he
h
elp
text
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
David Aguilar
pull: add pull
.
ff co
n
figura
t
ion
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-21
David A
g
uil
a
r
imap-s
e
nd: e
l
im
i
nate HMAC
deprecati
o
n warnings
o
n Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
Da
v
id Aguilar
cache
.
h: eliminate
S
HA-1 deprecation wa
r
nings on M
a
c
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David Aguil
a
r
M
ak
e
file: add support
for Apple Com
m
o
n
Crypto fac
i
lity
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-11
David A
g
uilar
Makefile: fi
x
d
e
f
a
ult regex settin
g
s
o
n
Darwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-09
Da
v
id Agui
l
ar
mergetools/kd
i
ff3: do not us
e
--aut
o
when d
i
ffin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-04-16
Da
v
id Aguilar
hel
p
.
c: add a compatibility commen
t
to cmd
_
version()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Agu
i
lar
c
ontri
b
/
mw-to-git/t/instal
l
-
w
iki
.
sh:
u
se a low
e
r
c
ase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
contrib/examples/git-remot
e
.
perl: use a lo
w
erc
a
se
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
tests:
use
a
lowercase "usa
g
e:"
s
t
rin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguila
r
git
-
svn: use a lowercase "u
s
age:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Aguil
a
r
Docume
n
tation/user-manu
a
l
.
txt: use a lowe
r
c
ase "us
a
ge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
g
u
i
l
ar
t
emplates/hook
s
--update
.
sampl
e
: use a lowerc
a
s
e
"usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d
Aguila
r
co
n
trib/hooks/
s
etgitperms
.
perl:
use a
lowercase "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avi
d
Aguil
a
r
contrib/examples
:
use a lowercase "
u
sage:
"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Aguilar
c
o
ntrib/fas
t
-import/imp
o
r
t
-
zip
s
.
py: use spac
e
s instead
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contrib/fast-import/import-
z
ips
.
py: fix broken
e
rro
r
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contri
b
/fa
s
t-impo
r
t:
use
a low
e
rc
a
se "usage:
"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
con
t
rib/credential: use a lowercase "usage:" s
t
ring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-cvs
i
mport: use a lower
c
ase "usa
g
e:" str
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
g
it-cvsimport: use a lo
w
e
rcase
"
u
sage:" s
t
ring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
uilar
git-cvsexpo
r
tcommi
t
:
u
s
e
a
low
e
rcase
"usage:"
s
t
ring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git
-
a
r
chim
p
o
r
t: use a
lowe
r
case "usage:" strin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d
A
g
uilar
g
i
t-mer
g
e
-one-file: use a lowercase "us
a
ge
:
"
s
t
ring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguil
a
r
git-relink: use a
l
ow
e
r
case "u
s
age:" st
r
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Aguilar
git-svn:
u
se 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-sh-setup: u
s
e a lowerc
a
se "usa
g
e:
"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David Aguilar
t7800: "defaults" i
s
no lon
g
er a builtin tool name
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David Aguilar
t7
8
00: mode
r
nize tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-20
David Agui
l
ar
t7800: up
d
ate copyright not
i
ce
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-17
D
a
vid Aguil
a
r
difftool: silence u
n
initial
i
zed variable warn
i
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
D
avid Agu
i
l
a
r
p4merge
:
fix printf
u
s
age
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
Dav
i
d
A
guilar
di
f
fto
o
l--
h
elper: fi
x
printf
u
sage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David Aguilar
doc:
gene
r
ate
a
lis
t
of va
l
i
d merge tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David Aguilar
mergetool--lib: a
d
d functions
f
o
r
fi
n
din
g
a
v
ailab
l
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
D
avid Agui
l
ar
mergetool--
l
ib
:
impr
o
v
e the
help tex
t
in gue
s
s_merge_tool()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Agu
i
l
a
r
mergetool--
l
i
b
: sim
p
lify command express
i
ons
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
mergetools: simplify how we handle "vim" a
n
d "defau
l
t
s"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David
A
g
ui
l
ar
me
r
getoo
l
--lib: impro
v
e sho
w
_
to
o
l_hel
p
() output
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
Dav
i
d
Ag
u
ilar
merge
t
ools
/
vi
m
: remove redundant diff
c
ommand
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next