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
test-*-cache-tree: setup git dir
2016-10-11
David Agu
i
lar
me
r
getool: hono
r
-O
<
orderfile>
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
Dav
i
d
A
guilar
merget
o
ol: hon
o
r diff
.
orderFi
l
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
Dav
i
d Aguilar
me
r
g
e
t
ool:
m
o
ve main program flow into a main() func
t
ion
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
David A
g
uilar
m
e
rgetool: add copyright
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
David Aguilar
difftool: use Git::* functions ins
t
e
ad of passing a
r
ound
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
David Aguilar
d
i
fftool:
avoid $
G
I
T
_
D
IR
a
n
d $G
I
T_
W
O
R
K_T
R
EE
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
David A
g
uilar
s
ubtree: adjust
funct
i
o
n defi
n
iti
o
n
s
t
o match Coding
G
uidel
i
nes
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
D
avid Aguilar
s
ubtree: adjust sty
l
e
to match Codi
n
gGuidelin
e
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-26
D
avid A
g
uilar
subtree:
f
ix "git subtr
e
e split --rejoin"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-26
David
Aguilar
t
7
9
00-subtree
.
sh:
f
i
x
quoting
and broken
&
& ch
a
ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-05-16
David
Aguilar
difft
o
ol: handle unmerged files in dir-diff mode
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-05-16
Dav
i
d
A
guilar
difftoo
l
:
i
nit
i
al
i
ze variab
l
es for readability
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-03-10
D
a
vid Aguilar
m
ergetool
:
honor tempfi
l
e configur
a
t
i
on when re
s
o
l
v
ing
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-03-10
David Aguilar
m
ergetool
:
suppor
t
d
e
l
e
te/de
l
ete conflicts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-10-29
David Aguil
a
r
diff
t
ool: ignore sym
b
oli
c
l
i
nks in use
_
wt_file
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-07-23
D
a
vid Aguil
a
r
contrib/
s
ubtree: ignore
l
og
.
date configuration
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
David
A
guil
a
r
mergetools: add
w
in
m
e
r
ge as a
b
uiltin tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
David Aguilar
mergeto
o
l
--lib: se
t
I
F
S f
o
r diffto
o
l and merge
t
ool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
D
avid Agui
l
ar
mer
g
e
tools: st
o
p
setting $status
i
n
merge_c
m
d()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
Da
v
id Aguilar
mergetoo
l
: si
m
plify
c
onditionals
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David Ag
u
ilar
difftool--helper: add e
x
plicit exit state
m
ent
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David Aguilar
mer
g
e
t
o
ol--lib: r
e
move use of $st
a
t
us global
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-14
David Aguila
r
diff
t
o
o
l
:
hono
r
--trust-
e
xit
-
code for builtin tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-28
David Ag
u
ilar
d
i
fftool: add sup
p
ort
f
or --trus
t
-exit-
c
ode
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David
Aguilar
t7610
-
mergetool: add
test
c
ases
f
or merge
t
ool
.
writeToTem
p
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
Da
v
id Aguilar
m
erg
e
tool: ad
d
a
n
o
ption for w
r
iti
n
g to
a
temporar
y
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
Dav
i
d Aguil
a
r
me
r
getool: use more c
o
n
serva
t
ive tempora
r
y filenames
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
D
a
vid Aguilar
test-lib
-
fu
n
ct
i
ons: adju
s
t styl
e
to match
C
odingGuidelin
e
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
t7610-
m
ergetool: us
e
test_config
to
isola
t
e tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
m
e
rgetool
s
/meld: make usage of `
-
-output` configurable
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Agu
i
la
r
g
i
t-sh-setup: move GIT_DIR initialization
in
t
o a function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
D
a
v
i
d A
g
uilar
merget
o
o
l: us
e
mor
e
c
o
nserva
t
ive temporary filename
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Agu
i
lar
test-li
b
-functions: adjust style to ma
t
ch
CodingGuidelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
D
avid Aguilar
t
7
6
10-me
r
get
o
ol: prefer
tes
t
_c
o
nfig over g
i
t conf
i
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Ag
u
i
l
a
r
t7610-mergetool: add miss
i
n
g
&
&
and remo
v
e commente
d
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David
Aguilar
t761
0
-mergetool:
use
tab
s
instead of a mix of tabs
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-07
David Aguilar
completion:
a
dd --show-signature for lo
g
a
nd s
h
ow
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
Da
v
i
d Agu
i
lar
stas
h
: prefer
-
-quiet
over s
h
ell redirection of the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
David A
g
uilar
refs: make rev-parse -
-
quiet actually quiet
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-16
D
avid Aguilar
t1
5
03: u
s
e
test_must_
b
e_empty
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
D
av
i
d Aguilar
Do
c
umentation: a n
o
te
a
b
out
stdout for git
r
ev-parse
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
David
A
guilar
cleanups:
ensure that git
-
comp
a
t
-util
.
h is inclu
d
ed
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-02
Da
v
id Aguilar
stylefix: asterisks stick t
o
the variable, not
t
he
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-27
David Aguilar
g
i
t
k
: Catch mkdtemp errors
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
Dav
i
d Aguilar
gitk: Use mktemp -
d
to av
o
id p
r
edi
c
t
able temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
David Aguilar
gitk:
Honor TMPDIR when viewing exter
n
al diffs
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-02-24
David Aguilar
difftool: support repositories
w
ith
.
git-fil
e
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
D
a
vid Aguilar
pull
:
add --ff-only to
t
he help tex
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
David Aguilar
p
ull: add pull
.
ff confi
g
u
r
ation
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-21
D
a
vid
Aguilar
imap-send: elimina
t
e HMAC depr
e
cation warn
i
ngs
o
n M
a
c
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David A
g
uilar
c
a
che
.
h: eliminate SHA-
1
deprecati
o
n
warnings on
Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David Aguilar
Makef
i
le: add support for Apple Commo
n
Cry
p
to facility
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-11
David A
g
ui
l
ar
M
akefile: fix
d
efault rege
x
settings on Dar
w
in
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-09
Dav
i
d Aguilar
mergetools/kd
i
ff3: do n
o
t
u
se --auto when d
i
f
f
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-04-16
David Agu
i
l
ar
help
.
c: add a compa
t
i
bility
com
m
ent to cmd_versi
o
n()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguil
a
r
co
n
trib/mw-to-git/t/in
s
tall-wiki
.
sh:
u
se a
l
ow
e
rcase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David A
g
uilar
con
t
r
ib/e
x
a
mples/git-remote
.
perl:
u
se a lo
w
ercas
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
Davi
d
Agu
i
lar
tests: use
a
lowe
r
case "us
a
g
e
:
"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David
Aguilar
git-svn: use a lo
w
ercase "usage:" strin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
Do
c
umentation/user-manual
.
txt
:
use a lowe
r
c
a
se "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid
A
guilar
templa
t
es/hooks--update
.
sample: use a lowerc
a
s
e "
u
sage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
c
o
ntr
i
b
/
hooks/set
g
i
t
perms
.
perl:
use a lowercase "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id
Agu
i
l
a
r
contrib/examp
l
es: u
s
e a lowercase "usa
g
e:" s
t
ring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
uilar
co
n
trib/f
a
st-import
/
import-zips
.
py: u
s
e spaces instead
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Agu
i
la
r
contrib/fast-import/import-zips
.
py: fi
x
b
r
oke
n
erro
r
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
uil
a
r
c
ontrib/fast-import: use a lower
c
ase "usa
g
e:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contrib/cred
e
ntial: us
e
a
lowerc
a
se "usage:"
strin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
g
it
-
cvsimport: u
s
e a
lowe
r
c
ase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Aguilar
g
i
t-cvsimport: use a low
e
rcase "usage:" st
r
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Aguila
r
gi
t
-cvsexp
o
rtcom
m
it: use a
l
owercase "us
a
ge:" stri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
gi
t
-ar
c
him
p
ort
:
use a lowercase "usage:"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Aguilar
gi
t
-m
e
r
ge
-
on
e
-fil
e
: u
s
e a lowercase "
u
sage:
"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
Aguilar
git-
r
elin
k
:
u
se a
lowercase "usage:" s
t
ring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-svn: u
s
e a lowercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
v
id
A
g
u
ilar
git-sh-setup: use a lowercase "usa
g
e:" stri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David Aguilar
t7800: "defaults"
is no
l
onger a builtin t
o
ol n
a
me
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
Davi
d
Agu
i
lar
t7800: modernize tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-20
David Aguilar
t7800: upda
t
e copyright not
i
ce
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-17
David
Aguilar
d
i
f
f
t
ool: silence uninitialize
d
v
ariable
w
arning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David Aguil
a
r
p4merge:
fix printf u
s
a
g
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David Aguilar
d
i
fftool--h
e
lp
e
r
: fix p
r
intf u
s
age
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David Aguilar
doc: generate a list
of
valid m
e
rge t
o
ols
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David Ag
u
ilar
m
ergeto
o
l
--lib: add f
u
nctions for
finding availabl
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
Davi
d
A
g
u
i
l
ar
mergetool-
-
lib: improve the help text in guess_merge_tool()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David
A
guilar
merget
o
ol--lib: simplify command e
x
pr
e
ssions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David A
g
uilar
mergeto
o
ls: simplify how we
h
andle "vi
m
" and "defaults"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David A
g
ui
l
ar
mergetool-
-
lib:
i
m
p
rove
show_to
o
l_help() ou
t
put
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
D
a
v
id A
g
uilar
merge
t
ools/vim:
r
e
move redundant diff com
m
and
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-12-27
David
Aguilar
m
e
rgetools/p4merge: Ho
n
or $TMPDIR for the /
d
ev/null
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-10-11
D
avid
Aguil
a
r
mergetools/p4
m
erge: Ha
n
dle "/dev/
n
ull"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
David Agui
l
ar
m
erge
t
ool--lib: Allow cus
t
om comm
a
nds
to
o
v
erride built-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
Dav
i
d Aguilar
gi
t
k:
R
ename 'tagcon
t
en
t
s' to 'ca
c
he
d
_tagcontent'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
D
avid Aguilar
gitk
:
T
e
a
ch
"
R
ere
a
d references"
t
o
relo
a
d tags
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
D
avid Aguilar
merg
e
too
l
,dif
f
too
l
: Document --too
l
-
h
el
p
cons
i
stently
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
difftool: Disabl
e
-
-symlin
k
s
on cygwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
Da
v
i
d
Aguilar
d
i
fft
o
ol: Handle compare
(
) returning
-
1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
difftool: Wrap l
o
n
g
l
i
n
e
s
for
readab
i
l
i
ty
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
Davi
d
Agu
i
lar
diff
t
ool: Check
all
r
etu
r
n codes fr
o
m
c
o
m
pare()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
Dav
i
d
Aguilar
difftool: Handle finding merget
o
ols/ in a path with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftoo
l
:
Use symli
n
k
s
when dif
f
ing against the work
t
ree
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next