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
has_sha1_file: don't bother if we are not in a repository
2016-10-11
David
Aguilar
me
r
getool: honor
-O
<
order
f
ile>
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
D
a
vid Ag
u
i
l
ar
merget
o
ol: honor diff
.
o
rderFile
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
Da
v
id A
g
uilar
merge
t
o
o
l: move main
p
ro
g
ram
flow into
a
m
ain(
)
funct
i
on
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
Da
v
id Aguilar
mergetool: add copyright
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
David
Ag
u
ilar
dif
f
t
o
ol:
u
se Git::* fu
n
c
tions inste
a
d
o
f
p
assing a
r
ou
n
d
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
Da
v
id
A
guilar
difftool
:
a
v
oid $GIT_DIR a
n
d
$
GIT_WOR
K
_TREE
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
Dav
i
d Aguilar
subtree:
a
djust function
definitions to match CodingGuidelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
David Agu
i
l
a
r
subtr
e
e
: a
d
just style to match CodingGuidelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-26
D
a
vid A
g
u
i
lar
subtree
:
fi
x
"git subtree split
-
-
rejoin"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-26
Da
v
id
Agui
l
ar
t7
9
00-subtree
.
s
h
:
fix quoting and broken && chains
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-05-16
David
Aguilar
difftoo
l
:
h
andle un
m
erge
d
f
i
les in dir-
d
iff mode
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-05-16
David Aguilar
dif
f
tool: initiali
z
e
v
aria
b
les f
o
r
readability
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-03-10
Da
v
id Aguilar
m
e
rgetool: honor
t
empfile configuration when resolving
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-03-10
David Aguilar
me
r
getool: support
delete/delete conflicts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-10-29
David Aguilar
d
i
fftool: ignore symbo
l
ic links in use
_
w
t_file
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-07-23
David Aguilar
contrib/
s
ub
t
ree: ignore log
.
date configuration
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
Da
v
id Aguilar
merg
e
tools: add
w
inmerge as a builtin tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
David Agu
i
lar
m
e
rgetool--lib: set IFS for
d
ifftool and mergetool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
D
a
vi
d
Aguilar
mergetools: stop
settin
g
$status in
m
e
r
ge_cmd()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
Da
v
id
Aguilar
me
r
getool: simpl
i
fy co
n
dit
i
onals
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
D
a
v
id Agu
i
lar
difftool--h
e
l
per: add
exp
l
icit ex
i
t statement
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
Da
v
id Aguilar
mergeto
o
l--lib: remove use of $status glob
a
l
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-14
D
avid Agu
i
lar
difftoo
l
:
honor --
t
r
u
st-ex
i
t-code f
o
r builtin
t
o
ol
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-28
David
A
g
uilar
difft
o
ol: add support
f
o
r -
-
t
rust-exit-code
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Agui
l
ar
t7610-mergetool: add test
c
ases
f
or mergetool
.
wr
i
t
e
ToTe
m
p
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
Davi
d
Aguil
a
r
me
r
getool: add
a
n op
t
ion for writing to a temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Agu
i
lar
mergeto
o
l:
use more conservative temporary filenames
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David
Agui
l
ar
test-lib
-
funct
i
o
n
s
:
adjust style to matc
h
CodingG
u
idelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
t7610-me
r
getool: use test_confi
g
to isol
a
te tes
t
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
mer
g
etools/meld: make u
s
a
g
e
of `-
-
outpu
t
` co
n
figu
r
able
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
D
a
vid A
g
uil
a
r
git-
s
h-setup
:
move GIT_DIR
i
n
itializ
a
tion int
o
a function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
m
ergetool:
u
se more conservativ
e
tem
p
orary
f
ile
n
ames
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguila
r
t
e
st-lib-functions: adjust style to match CodingGuidelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Agu
i
lar
t
7
610-m
e
rget
o
ol: prefe
r
test_conf
i
g over
g
it config
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
Da
v
id Aguilar
t7610-merg
e
tool: ad
d
missing && and re
m
o
ve
commented
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
D
av
i
d Aguilar
t
7610-mergetool: use tabs instead
o
f a mix of
tabs
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-07
David Aguilar
completion: add --show-signatur
e
for log and
show
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
David A
g
ui
l
ar
stash: pr
e
f
er --quie
t
o
ver
s
hell red
i
rection of
the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
Da
v
id Aguila
r
refs: make r
e
v-parse --qu
i
et actually q
u
i
et
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-16
D
avid Aguilar
t
1
503: us
e
te
s
t_must_be_empty
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
David Aguilar
Docu
m
e
n
tation: a note abou
t
s
t
d
o
u
t for
g
it rev-parse
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
David Aguilar
cle
a
n
ups: ensu
r
e that g
i
t-co
m
pat-util
.
h is in
c
luded
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-02
David A
g
uilar
stylefix: ast
e
risks stick to
t
h
e v
a
ri
a
ble,
not the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-27
David Aguilar
g
itk: Ca
t
ch
m
kdtemp errors
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
David Aguilar
g
itk: Use m
k
temp -d
t
o
a
void
p
redictable temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
David Aguilar
gitk
:
Honor TMPDIR when
viewing externa
l
diff
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-02-24
Davi
d
Agu
i
l
ar
difft
o
ol: suppo
r
t re
p
ositories with
.
g
i
t-
f
iles
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
David Aguilar
pull: add --ff-only
t
o the help te
x
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
D
avi
d
Aguilar
p
u
ll: add pull
.
ff config
u
ration
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-21
Davi
d
Aguilar
i
m
ap-send: eliminate HMAC deprecation war
n
i
ngs on
M
ac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David Agui
l
ar
cache
.
h:
eliminate SHA-
1
deprecation w
a
rnings on
M
a
c
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David Aguil
a
r
Makefile: add support
f
or Apple CommonCrypto facility
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-11
David Aguilar
Makefile: fix defau
l
t
regex set
t
i
n
gs on
Darwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-09
David A
g
uilar
mergetools/kd
i
ff3:
do n
o
t us
e
-
-auto whe
n
diffing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-04-16
Davi
d
Agui
l
ar
help
.
c
:
add a compatibility com
m
en
t
to
cmd_version()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
Da
v
id
Ag
u
ilar
c
ontrib/mw-to-gi
t
/t/in
s
tal
l
-wiki
.
sh:
u
s
e a
low
e
r
c
ase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
Dav
i
d Aguilar
c
ontrib/examples/gi
t
-
r
e
m
ote
.
per
l
: use a lowe
r
case
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguil
a
r
t
e
sts: use a low
e
rc
a
se "usage:" str
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
D
a
vid A
g
u
i
la
r
git-svn: use a lowercase
"
usage:"
s
tring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
ui
l
ar
Docu
m
e
n
t
at
i
o
n
/
u
s
e
r-man
u
a
l
.
txt
:
use a low
e
rcas
e
"usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
Agu
i
lar
t
emplates/hooks--u
p
date
.
sample: use a lowercase "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
i
d Agui
l
ar
contrib/hooks/setgitperms
.
p
erl: use a lowercase "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Aguilar
c
o
ntr
i
b/examples: use a low
e
r
c
ase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Agu
i
lar
co
n
t
r
ib/fast
-
import/import-z
i
ps
.
py: use spaces in
s
t
ead
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
c
ontrib/fast-import/impor
t
-zips
.
p
y: fix b
r
oken e
r
ror
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Aguilar
contrib/fast-import: use a lowercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Ag
u
ilar
contrib/cred
e
n
tial:
use a lowe
r
case "usa
g
e:" strin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
guilar
git-cvsimport: use a lo
w
ercase "usa
g
e:" st
r
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Agu
i
lar
git
-
cvsimport: use a lowercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Aguilar
git-cv
s
exportcommit: use a lowercase "u
s
age:
"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Aguilar
git-a
r
chi
m
port
:
use a lowercase
"
usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Aguilar
git-merge
-
o
n
e
-file: use
a
l
ow
e
rcas
e
"usage:"
s
tring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vi
d
Aguilar
g
i
t-relink: use a
lowercase
"usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
v
id Aguilar
git-
s
vn: use a lower
c
ase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id
A
g
uilar
git-sh-
s
etup:
use a l
o
w
e
rcase "usage
:
" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David Aguilar
t780
0
: "defaults" i
s
no longer a builti
n
tool name
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
Dav
i
d
A
guilar
t7800:
m
odernize t
e
sts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-20
David
Aguil
a
r
t7800: up
d
ate
cop
y
rig
h
t notice
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-17
Dav
i
d Aguilar
d
i
fftool: s
i
lence uninitialized varia
b
le warning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David Aguilar
p
4merge:
f
ix printf usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David
A
g
uilar
difftoo
l
--help
e
r: fix printf usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
D
a
vid Agui
l
ar
do
c
: genera
t
e
a list
of valid merge too
l
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David Aguil
a
r
merg
e
t
ool--lib: add
functions for finding av
a
ilable
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
me
r
getool--
l
ib: imp
r
ove the h
e
lp text in g
u
ess_
m
erge_tool()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David A
g
uila
r
mergetool--lib: simplify command exp
r
e
s
sions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
mergetool
s
: simplify ho
w
w
e
handle "vi
m
" and "defau
l
ts"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David Agui
l
ar
m
ergetool--li
b
:
impr
o
ve show_to
o
l_help() output
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David Agui
l
ar
m
er
g
etoo
l
s
/vim:
r
em
o
ve redundant
d
iff co
m
mand
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-12-27
David
A
gui
l
ar
mer
g
etools/p
4
m
erge: Honor
$
T
MPDIR for the /dev/nul
l
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-10-11
David
A
gui
l
ar
me
r
getools/p4merge: Handl
e
"/dev
/
null"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
David Aguil
a
r
mer
g
etool--lib: All
o
w
custom commands to ov
e
rride built-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
D
a
vid Aguil
a
r
gitk: Rename 'tagconten
t
s' to 'cached_tagcontent'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
D
a
vid Agu
i
lar
gitk: Teach "Reread references"
t
o
r
eload
t
ags
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
David A
g
u
i
lar
mergetool
,
diff
t
ool: Document --tool
-
help c
o
n
s
istently
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David
A
guilar
difftool: Disab
l
e --symlinks on cyg
w
in
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
Davi
d
Agui
l
a
r
d
ifftool: H
a
ndle compar
e
() ret
u
rning -1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David
A
guilar
difftool: Wrap lo
n
g lines for rea
d
abil
i
ty
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David
Agu
i
lar
diff
t
ool: Check
all retu
r
n codes
f
rom co
m
pare()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
Da
v
id
A
g
u
ilar
difftool:
Ha
n
d
le fi
n
ding me
r
getools/ in a p
a
th
with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Davi
d
Aguila
r
difftoo
l
: Use symlinks w
h
e
n d
i
ff
i
n
g
ag
a
i
nst
t
he worktree
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next