repo.or.cz
/
git
/
git-svn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'bc/blame-doc-fix'
2017-02-08
D
avid Ag
u
i
lar
t
7
8
0
0
:
replace "wc -l" with test_line_count
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-02-08
D
a
v
i
d Aguilar
t7800: simplify basic us
a
ge test
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-02-06
Davi
d
Aguilar
dif
f
tool:
fix bu
g
w
hen printing u
s
age
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-01-18
David Aguilar
git
k
: Remove translat
e
d m
e
s
s
age from comme
n
ts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
David Ag
u
il
a
r
mergetools: fix xx
d
i
ff h
o
tke
y
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
David Ag
u
ilar
difftool: rename va
r
iables for consistency
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
David Aguilar
difftool: c
h
dir as
ea
r
ly as
possible
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
David Aguilar
di
f
ftool: sanitize $wo
r
kdir as
e
arl
y
as
pos
s
i
ble
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
D
a
vid
A
guilar
difftool: fi
x
d
ir-diff inde
x
creation when in a su
b
d
i
rec
t
ory
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-08
David Aguila
r
d
ifftool
:
fix dir-
d
iff inde
x
creation when
i
n
a subd
i
rectory
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-11-29
David Aguilar
m
ergetools/v
i
mdiff: trust Vim's exit code
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-11-29
Dav
i
d Aguilar
mergetool: honor m
e
r
getool
.
$tool
.
trustExit
C
o
d
e fo
r
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
Davi
d
Agui
l
ar
mergetool: h
o
nor -O
<
orderfil
e
>
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
Da
v
id Agu
i
lar
mergetool: honor dif
f
.
orderFile
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
Da
v
id Aguilar
mergetoo
l
: mov
e
m
ain program flo
w
into a
m
a
i
n() f
u
ncti
o
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
David
A
g
u
i
l
a
r
mergetool: add cop
y
right
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
David Aguilar
d
ifftool: use Git::* functions instead of passing ar
o
und
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
David Aguilar
d
if
f
t
ool: avoid $
G
I
T
_DIR and $GIT_
W
ORK_TR
E
E
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
David Aguilar
subtree: ad
j
u
st
f
u
n
ction def
i
n
i
tions to matc
h
C
o
dingGuidelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
D
a
v
id Aguilar
s
u
btr
e
e: adjust
style to matc
h
CodingGuidelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-26
Dav
i
d Aguilar
s
ub
t
ree: fix "git subt
r
ee split --rejoin"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-26
Dav
i
d
Aguilar
t7900-subtree
.
sh: fix
q
uoting
an
d
broken &&
c
hains
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-05-16
Dav
i
d Aguilar
difftool: han
d
le unmerged f
i
les
i
n dir-dif
f
mode
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-05-16
D
a
vid Aguilar
difftool: initiali
z
e variab
l
es
f
or readabil
i
t
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-03-10
David Ag
u
ilar
mergetool:
h
o
n
or temp
f
ile con
f
igu
r
a
tion w
h
en re
s
olving
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-03-10
David A
g
u
i
lar
mergetool: s
u
pport
d
elete/del
e
t
e
conflicts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-10-29
David A
g
uilar
diffto
o
l: ignore symbolic links
i
n use_wt_f
i
le
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-07-23
David
Aguilar
con
t
rib/subtree
:
ignore log
.
date c
o
nf
i
gur
a
tion
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
David Aguila
r
merge
t
ools: add
w
inmerge as a builtin tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
David Aguilar
m
ergetool
-
-li
b
: set IFS for dif
f
too
l
an
d
merget
o
ol
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David Aguilar
merget
o
ols
:
stop se
t
ti
n
g $status in merge
_
cm
d
()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
D
a
vid Aguil
a
r
mergetool: si
m
plif
y
c
o
nditionals
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
Davi
d
Ag
u
il
a
r
difftool--helper
:
add
explicit exit
s
t
ateme
n
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
Dav
i
d Aguilar
merg
e
t
o
o
l
-
-
lib:
remov
e
use o
f
$status
global
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-14
David Ag
u
il
a
r
difft
o
ol: honor -
-
t
r
ust-exit
-
code for bui
l
tin tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-28
David A
g
uil
a
r
d
i
f
f
tool: add support for
--trust-exit-code
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
D
avi
d
Aguil
a
r
t7610-me
r
g
e
tool
:
add
t
es
t
cases
f
o
r mergetool
.
writeT
o
Temp
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
mergeto
o
l: add
an opt
i
on f
o
r
writing
t
o
a temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
me
r
getool: use more conserv
a
tive temp
o
rar
y
filenames
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
Davi
d
Aguilar
test-lib-functions: adjust
s
tyle to match
C
od
i
ngGuidelin
e
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Agu
i
lar
t7610-mergetool: use test_co
n
fig to isolate test
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
Da
v
id Aguil
a
r
me
r
g
e
tools/
m
eld: make
usage
of
`--out
p
ut
`
c
o
n
figurable
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David
A
guilar
gi
t
-sh-setup
:
move GIT_DI
R
initializa
t
ion int
o
a function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
merge
t
ool: use more conservati
v
e temporary file
n
ame
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguila
r
test-lib-functions: adjust style to match Coding
G
uidel
i
nes
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Agu
i
lar
t
7610-mer
g
et
o
ol:
p
r
efer
t
est_config over gi
t
conf
i
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
D
a
vid Aguilar
t
761
0
-merget
o
o
l: add m
i
s
s
ing &&
a
nd remove commented
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Ag
u
ilar
t
7610-m
e
rgeto
o
l
:
use tabs instead of
a mix of tabs
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-07
Davi
d
A
guilar
completion:
ad
d
--sh
o
w-signature for log and sho
w
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
Davi
d
Aguilar
stash: prefer
-
-quie
t
over shell redirection of the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
David Ag
u
il
a
r
refs: make rev-p
a
rs
e
--
q
uiet ac
t
uall
y
quiet
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-16
D
a
vid Agui
l
ar
t1503: use
t
est_
m
ust_be_empty
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
David Aguilar
Docume
n
tation: a
note
a
b
o
ut stdou
t
for git rev-parse
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
David A
g
uilar
cleanups: ens
u
re that git-com
p
at-util
.
h is included
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-02
D
a
vid Agui
l
ar
stylefix:
a
s
teris
k
s stic
k
to t
h
e
v
a
r
i
able
,
n
o
t the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-27
D
avid
Aguilar
gi
t
k: Catch mkdtemp er
r
ors
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
David A
g
u
i
lar
gitk
:
U
s
e mktemp -d
to a
v
oid predi
c
table temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
David A
g
ui
l
a
r
gitk: Honor TMPDIR when viewing external diffs
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-02-24
Davi
d
A
guilar
di
f
ft
o
ol: sup
p
ort repositories with
.
git-files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
David Agui
l
ar
pull:
a
dd --ff
-
on
l
y t
o
the hel
p
text
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
David Aguilar
pull: add pull
.
f
f configuration
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-21
David Ag
u
ila
r
imap-se
n
d
:
elimi
n
ate HMAC
deprecation warnings on Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
Davi
d
Aguilar
cache
.
h: eliminate SHA-1 deprecation warnin
g
s on M
a
c
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David Aguilar
Makefile:
a
dd support f
o
r Ap
p
le C
o
mmonCrypto facilit
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-11
D
avid Aguilar
Makefi
l
e: fix default regex setti
n
g
s
on
Darwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-09
Da
v
id
Aguilar
m
e
rgetools/k
d
if
f
3
:
do
n
ot
use -
-
auto
w
hen diffing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-04-16
Dav
i
d Aguilar
help
.
c: add a
c
ompat
i
bility comment to
c
md_version()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
Da
v
id Aguilar
cont
r
ib/mw-t
o
-git/
t
/install-wiki
.
s
h: use a lo
w
ercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David A
g
uilar
cont
r
ib/
e
xamples/git-remote
.
perl: use
a
lowercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
D
a
vid Agu
i
lar
tests: use
a lowercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
Davi
d
Ag
u
il
a
r
git-svn: use
a
low
e
rca
s
e "usage
:
" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
Agu
i
lar
Documentation/user-manual
.
txt:
u
se
a
l
o
w
ercase "usag
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Aguilar
tem
p
lates/hoo
k
s--upda
t
e
.
s
ampl
e
: use a lowe
r
ca
s
e "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vi
d
Aguilar
contrib/h
o
o
ks/setgitperms
.
p
e
rl: use a lowercase "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Aguilar
c
on
t
ri
b
/exam
p
les: u
s
e a
l
o
werca
s
e "usa
g
e:" str
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
c
ontrib/
f
a
s
t-import/impor
t
-zips
.
py:
u
se spaces inste
a
d
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Aguil
a
r
c
ontrib/fast-import/im
p
ort-zips
.
p
y
: fix brok
e
n error
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguila
r
contrib/
f
a
st-impo
r
t: use a low
e
rcase
"
usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Aguilar
c
o
n
t
rib/c
r
edential:
use a lowercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
ui
l
a
r
g
i
t
-cvsimport: use a l
o
wercase
"
usage:" str
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Ag
u
ilar
git-c
v
simport: use a lowercase
"
usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
guilar
git-cvsexportcommit:
u
se a low
e
rcase "u
s
age:" stri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-archimp
o
rt: use a lowerca
s
e "
u
s
a
ge:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-merge-on
e
-
f
ile: use a lowercase "usage:" st
r
i
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Aguilar
git-relink: use
a lowercas
e
"
u
sa
g
e
:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
v
i
d Agu
i
lar
g
i
t-s
v
n: use
a
lowercase "us
a
ge:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Aguilar
git
-
sh-
s
etup
:
use a
l
owercase "usa
g
e:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David Aguilar
t
7
8
00:
"
defa
u
lts" is no longer
a
builtin tool name
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David Aguilar
t7
8
00
:
moder
n
i
z
e tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-20
D
a
vid
A
guilar
t
7
800: u
p
d
a
te copy
r
ight
notice
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-17
David A
g
u
i
lar
d
i
f
f
to
o
l: sil
e
n
c
e
uniniti
a
l
i
zed variabl
e
warning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David
A
guilar
p
4
merge: fix
p
rint
f
usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
Da
v
id Aguila
r
diff
t
ool
-
-helper: fix p
r
intf us
a
ge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
Da
v
id
Aguilar
doc:
gener
a
te a list of v
a
lid me
r
ge to
o
ls
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
Davi
d
Aguilar
m
ergetool--lib: add
f
unctions
f
or finding available
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Agui
l
ar
mergetoo
l
-
-lib:
i
mprove the
h
elp text in
g
u
ess_
m
erge_tool()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Ag
u
ilar
merget
o
ol--lib:
s
implify co
m
mand expressions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David
Aguilar
mergetools: simplify
h
o
w
w
e ha
n
dle "vim" and "default
s
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
D
a
vid Aguilar
mergetool--lib: improv
e
s
how_
t
ool_help() output
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David Agui
l
ar
mergetools/
v
im:
r
emove redun
d
ant diff command
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next