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 'maint-2.8' into maint-2.9
2016-07-28
David Agui
l
ar
d
i
fftool: us
e
Git::* funct
i
o
ns instead of
p
assin
g
a
r
ound
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
D
av
i
d
A
guilar
difftoo
l
:
avoid
$GIT_
D
IR
a
nd $
G
IT_
W
ORK_T
R
EE
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-26
Da
v
id Aguilar
su
b
tree:
fix "git
s
ubtree spl
i
t --rejoin
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-26
Dav
i
d Aguilar
t7900-subtree
.
sh:
f
ix qu
o
ting and broken
&
& c
h
a
i
ns
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-05-16
D
avi
d
Aguilar
di
f
f
tool: handle
unmerged
files in dir-diff mod
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-05-16
David Aguilar
difftool: i
n
itialize
v
ariab
l
es for readability
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-03-10
David Aguilar
merge
t
ool:
honor tempfile configu
r
ation when reso
l
ving
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-03-10
Da
v
id
Agui
l
ar
m
e
rget
o
ol:
s
up
p
ort delete/del
e
te co
n
fl
i
cts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-10-29
David Aguilar
difftool
:
i
gnore symbolic
l
inks
i
n use_wt_fil
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-07-23
David Agui
l
ar
contrib/
s
ub
t
ree:
ignore lo
g
.
date config
u
ration
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
David Aguila
r
mergetool
s
: add winmerge a
s
a built
i
n tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
Da
v
id
A
gu
i
lar
merge
t
oo
l
-
-lib: set I
F
S
for di
f
ftool
a
n
d
mergeto
o
l
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David
A
g
u
i
lar
mergetools: s
t
op s
e
tting
$
s
t
atus in m
e
rge
_
cmd()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David Aguil
a
r
merg
e
tool: simp
l
if
y
c
ond
i
tionals
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
D
a
vid Aguilar
difftool--
h
elper: add
explicit
e
xit statement
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David
Aguilar
mergetool
-
-lib: remove use of $status global
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-14
David Agui
l
ar
difft
o
o
l: honor --
t
rust-exit
-
code for builtin too
l
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-28
Da
v
id
A
guilar
difftool:
a
dd support for
-
-trust-
e
xit
-
code
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
t7610-mergetool:
a
dd test cas
e
s for mergetool
.
writeT
o
Temp
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David A
g
uilar
merget
o
ol: add an
option
f
or writi
n
g to a tempora
r
y
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
mer
g
eto
o
l:
use more conservative temporary filenames
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
test
-
lib-
f
unctions: adjust style to match CodingGuide
l
ines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David
Agui
l
ar
t
7610-
m
er
g
eto
o
l:
u
se
te
s
t_conf
i
g to isolat
e
tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David A
g
uilar
mergetools/me
l
d: make usage of `--out
p
u
t
`
c
onfigurable
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David
Agu
i
lar
git-sh-setu
p
:
move
GIT_DIR ini
t
ializati
o
n into a funct
i
on
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
Davi
d
Aguila
r
mergetoo
l
: use m
o
re conservative
t
e
m
porar
y
filenames
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguil
a
r
test-lib-functi
o
ns:
adju
s
t style to match CodingGuidelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
t
761
0
-mer
g
etool: pre
f
er test_config over git co
n
f
i
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
t
7
610-me
r
geto
o
l: add missing &
&
and remove
commented
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
Dav
i
d Agui
l
ar
t7610-mergetoo
l
:
use
t
abs inst
e
ad o
f
a mix of tabs
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-07
David Aguilar
comple
t
ion: add --s
h
ow-signatur
e
for log
and sho
w
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
David Aguil
a
r
stash: prefer
-
-quie
t
over shell redire
c
tion of the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
David Agu
i
lar
refs: make r
e
v
-
parse
--quiet actu
a
lly quiet
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-16
David Aguilar
t1503:
use test_mus
t
_b
e
_empty
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
Da
v
id Agui
l
ar
Documentation: a note about stdout for git rev-par
s
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
David Aguilar
cleanups: ensu
r
e th
a
t
git-
c
ompat-util
.
h is i
n
cluded
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-02
David
Aguilar
stylef
i
x:
a
ste
r
isks stick
to the va
r
iable, not
t
he
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-27
David Aguil
a
r
gitk: Catch mk
d
temp errors
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
David Aguilar
gi
t
k: Use mktemp -
d
to avoid
p
re
d
ictable temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
David Aguilar
g
i
tk: Honor TMPDIR
when
viewing exter
n
al d
i
ffs
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-02-24
David Aguilar
difft
o
ol: supp
o
rt repositories with
.
git-fi
l
es
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
Da
v
id Aguilar
pull: add --ff-on
l
y
to the help
text
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
Davi
d
A
g
uilar
pull: add
p
ull
.
ff configura
t
ion
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-21
D
a
v
i
d Aguilar
i
m
ap-send
:
elim
i
nate HMAC deprecation warnings on Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
Dav
i
d Agui
l
ar
cache
.
h:
eliminate SHA-1 dep
r
eca
t
ion wa
r
n
i
ngs on Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David
Aguilar
Makefile:
a
dd su
p
port for Apple CommonC
r
ypto facility
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-11
David Agui
l
ar
Make
f
il
e
: fix
d
e
fau
l
t
r
e
ge
x
se
t
tings on
D
a
rwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-09
David Aguilar
mergeto
o
ls/kd
i
ff3: do not use --
a
ut
o
when
d
if
f
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-04-16
David A
g
uilar
help
.
c
: ad
d
a com
p
atibility comment to cmd_ver
s
ion()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
co
n
trib/mw-to-gi
t
/t
/
inst
a
ll-wiki
.
s
h: use a
l
owercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
contrib/ex
a
mple
s
/git-remote
.
p
erl: use a lowercas
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
Davi
d
A
guilar
tests:
u
se a lowercas
e
"us
a
g
e
:" st
r
in
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David A
g
uilar
git-svn: use a lower
c
ase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
uilar
Do
c
ument
a
tion/user-manual
.
txt: use a low
e
rcase "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
Ag
u
ilar
templates/ho
o
ks-
-
upda
t
e
.
s
a
mple: use a lo
w
ercase "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
c
ont
r
ib/hooks/setg
i
tper
m
s
.
perl: u
s
e a lowercase
"usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Aguilar
contrib/examples: use
a lowercase "usage:
"
stri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contri
b
/
f
ast-import/import-zips
.
py: use
spaces instead
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id
A
guilar
contrib/fast-import/import-zips
.
py:
fix broken er
r
or
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contrib/fast-impo
r
t: use a lowercase "u
s
age:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contr
i
b/credential: use a l
o
wercase "usage:
"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Aguila
r
g
i
t-cvsi
m
port: use a lowercase
"u
s
a
ge
:
" str
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
guil
a
r
git-cvsimpor
t
: use a
l
o
w
ercase "usage:"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
Aguilar
git-cvsexportcomm
i
t
:
u
se a low
e
rc
a
se "us
a
ge:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Agui
l
ar
git-archimp
o
r
t
:
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
-
merge-one-f
i
l
e:
u
se
a
lowerc
a
se
"
usag
e
:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
u
i
l
a
r
git-relink: use a lowercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
Aguilar
git-sv
n
: use a lowercase
"usage:" st
r
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Ag
u
ilar
git-
s
h-set
u
p: use a
l
owercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David A
g
uilar
t7800:
"default
s
" is no
l
on
g
er a builtin t
o
ol n
a
me
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David Aguilar
t7800: m
o
d
erniz
e
tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-20
D
avid A
g
ui
l
ar
t
7800: u
p
da
t
e copyright notice
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-17
David Agu
i
l
a
r
dif
f
to
o
l: silence
u
ni
n
itial
i
z
ed variable wa
r
n
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David Aguilar
p4merge: fix printf usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
Da
v
id
Agu
i
lar
difftool--helper: fix p
r
int
f
usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David A
g
uila
r
doc: g
e
ne
r
ate a l
i
st of valid merge
tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
D
avid Aguilar
m
e
rgetool--
l
ib: add
fu
n
ctions for fin
d
i
ng ava
i
lable
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David A
g
uilar
mer
g
etool--lib: improve th
e
help
t
ext
i
n guess_merge_tool()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
m
e
rget
o
ol--li
b
:
simpli
f
y
c
ommand express
i
ons
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Aguil
a
r
m
ergeto
o
ls: s
i
mp
l
ify
how
we handle "vim" and "d
e
fault
s
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David Aguilar
merget
o
ol--lib
:
i
m
prove
s
how_tool_help()
o
utput
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David A
g
uil
a
r
merge
t
oo
l
s/vi
m
: remove redundant diff command
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-12-27
Davi
d
Agu
i
lar
m
e
rg
e
tools/
p
4merge: Honor $TMPDI
R
f
or t
h
e /d
e
v/null
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-10-11
David Aguilar
mergetools/p4merge: Han
d
l
e
"/dev/n
u
ll"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
David
Agu
i
l
a
r
m
e
r
g
e
tool--lib
:
Al
l
o
w custom commands to
o
verride built
-
ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David Aguilar
gitk
:
Rename 't
a
g
con
t
e
nts' to 'cached_ta
g
content'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
D
a
vid
Agui
l
ar
g
i
tk: Teach "
R
eread refe
r
ences" to reload ta
g
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
David
A
guilar
me
r
get
o
ol,difftool: Document
--t
o
ol
-
h
elp consis
t
ently
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
d
i
fftool: Disable
--symlinks
on cygwi
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
difftool: Handl
e
compare() return
i
n
g
-
1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Ag
u
ilar
d
iffto
o
l
: Wrap lon
g
lines for re
a
dabili
t
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David Aguilar
difftool: Check all return codes from compare
(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
D
a
vid
Aguil
a
r
d
i
fftool:
Hand
l
e finding mergetools/ in a
path with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Dav
i
d
Aguilar
difftool: Use sym
l
i
n
ks when diffing against the worktr
e
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
D
avid Aguilar
difftool:
Call the t
e
mp dir
e
cto
r
y "git-difftool"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difft
o
ol: Move
o
ption values into a hash
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Agui
l
ar
d
i
fftool: Eliminate global
variables
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David A
g
u
i
lar
d
i
fftool
:
Simplify print_tool_hel
p
()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
David Aguilar
t7800:
Test difftool passing
a
rgument
s
t
o diff
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
D
a
vid A
g
uilar
merg
e
to
o
l: Provide an empty file whe
n
nee
d
e
d
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next