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
Merge branch 'bd/readme.markdown-more'
2016-05-16
David
Aguilar
d
i
fftool: ha
n
dl
e
unmerged files in dir-d
i
ff mod
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-05-16
D
avid
A
g
uilar
difftool: i
n
itia
l
iz
e
v
a
r
i
a
bles for read
a
bili
t
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-03-10
David Aguilar
m
e
rgetool: honor tempfil
e
conf
i
gur
a
ti
o
n 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 delete/d
e
le
t
e conflicts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-10-29
Da
v
id Ag
u
ilar
difft
o
ol:
i
gnore symbolic lin
k
s in
u
s
e
_wt_file
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-07-23
David A
g
uilar
cont
r
i
b
/subtre
e
:
ignore log
.
date
configuration
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
David Aguilar
mer
g
e
t
o
o
ls: add winmerg
e
as a builtin to
o
l
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
D
a
vid Aguilar
mergetool--lib:
s
et
I
F
S for difftool and merg
e
t
ool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
Da
v
id Agui
l
ar
me
r
getools
:
stop
s
etting $status in merge_cmd()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
Da
v
id A
g
uilar
mergetool: simplify cond
i
tionals
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David Ag
u
ilar
diff
t
ool--helper: add explicit exit statement
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
D
a
vid Aguilar
mergetool--li
b
:
r
emove
use o
f
$status global
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-14
D
a
vi
d
Aguila
r
difftool:
h
onor --t
r
ust-exit-code
f
or builtin tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-28
Davi
d
A
guilar
d
i
fftool: add support for --trust-exit-code
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David A
g
uilar
t7610-mergetool
:
add test case
s
for mergeto
o
l
.
writeToTemp
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
D
a
v
id Aguil
a
r
merget
o
ol
:
add an option for wri
t
ing
to a temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David
A
guilar
m
e
rget
o
ol: use more conservative t
e
mporary
f
ilenames
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David A
g
uil
a
r
test-lib-
f
unctions:
a
d
j
u
s
t s
t
y
le to match Co
d
in
g
G
u
idelin
e
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguil
a
r
t7610-
m
ergetool: use
test_co
n
fig to isolate
t
ests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Agu
i
lar
me
r
getools/meld: make u
s
age
o
f
`--output` configurable
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David A
g
uilar
git-
s
h-se
t
up: move GIT_DIR initializ
a
tion into a funct
i
on
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Ag
u
ilar
me
r
ge
t
ool: use mor
e
c
o
nservativ
e
tempor
a
ry filenames
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David
Aguil
a
r
test-l
i
b-
f
unctions
:
a
d
just
s
tyle to match CodingGuid
e
l
i
nes
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
t7610-me
r
geto
o
l:
p
refer test_config over
g
it c
o
nfig
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
t7610-mergetool: add missing &&
a
nd remove commente
d
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
t
7610-mergetool
:
use tabs inste
a
d o
f
a
m
ix of
t
abs
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-07
David
A
guilar
completion: add --show
-
sig
n
a
t
ure for log and s
h
ow
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
David Aguilar
stash: pref
e
r
-
-quiet ov
e
r shell
r
e
direction of the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
David Aguilar
r
e
f
s: make rev-parse --quiet actually quiet
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-16
David Aguilar
t
15
0
3: u
s
e test_
m
u
s
t_b
e
_empty
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
David A
g
ui
l
ar
Documenta
t
ion: a
n
ote about stdout for git rev-
p
arse
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
David
Aguila
r
cleanups: ensure
t
hat
git-compat-util
.
h is inc
l
ud
e
d
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-02
David A
g
u
i
lar
st
y
lefix:
a
sterisks stick
t
o the variable, not the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-27
David Aguila
r
gitk:
Catch mkdt
e
m
p
e
rrors
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
Davi
d
Aguilar
gitk: Use mktemp -d
to a
v
oid predic
t
able temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
David Aguilar
g
i
tk: Hon
o
r TMPDI
R
w
hen
vi
e
w
i
ng extern
a
l
dif
f
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-02-24
David Aguilar
difftool: support repos
i
tories w
i
t
h
.
git-files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
David Aguil
a
r
pu
l
l: add --ff-only to the help tex
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
D
a
vid Ag
u
ila
r
pull: add
p
u
ll
.
f
f
c
o
nfigur
a
t
i
on
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-21
David Aguilar
imap
-
send
:
elimin
a
te HMAC deprecation warn
i
ngs on
M
ac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David Aguilar
cache
.
h: eliminate SHA-1 deprecation warnings on
M
ac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David
A
g
uilar
Makefi
l
e: add support for Apple CommonCry
p
t
o f
a
cility
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-11
Da
v
id Aguilar
M
a
k
efile: fix
default regex settings
o
n Darwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-09
Davi
d
Aguil
a
r
mergetools/kdi
f
f3: do not
u
se -
-
au
t
o
when diffing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-04-16
D
avid Aguilar
help
.
c: add a compatibi
l
ity comment to c
m
d_versio
n
(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David
A
guilar
c
o
nt
r
ib/mw
-
to-git/t/
i
nstall
-
wi
k
i
.
sh: use a
l
owercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguila
r
contrib/examples/git
-
r
e
mo
t
e
.
perl: u
s
e a lo
w
ercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David
A
guilar
tests: use a
l
o
w
e
rc
a
se "u
s
age:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
Davi
d
Aguilar
gi
t
-svn: use a
lowercase "usage:" s
t
r
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
guilar
Doc
u
mentation/user-manu
a
l
.
txt
:
use a lowercase
"usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
templates/hooks-
-
u
pdate
.
s
ample: use
a lo
w
ercase
"usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
gui
l
a
r
contrib
/
hooks/setgitperms
.
perl:
use a lowercase "usag
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Aguilar
co
n
trib
/
examples: use a lowercase
"
u
s
age
:
" strin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d A
g
ui
l
ar
con
t
rib/fast-im
p
ort
/
import-zip
s
.
p
y
: use spaces inste
a
d
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguil
a
r
contrib/fast
-
import/import-zips
.
py
:
fix
broken
e
rror
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Aguilar
contrib/fast-imp
o
r
t
: use a lowercase "us
a
ge:" st
r
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d
Aguilar
contrib/cred
e
n
t
i
a
l: use
a low
e
r
case "u
s
ag
e
:" str
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
Agu
i
lar
git-cvsimport: u
s
e a low
e
rcase "u
s
age:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
Aguilar
g
i
t-
c
vsimport: us
e
a lowercase
"
usage:
"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Aguilar
git
-
cvsexportcomm
i
t: u
s
e
a
low
e
rcase "u
s
age:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Aguil
a
r
git-archimport: use
a lowercase "usage:"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid
A
g
u
ilar
g
it
-
m
e
rge-on
e
-file: use a
l
owercase
"u
s
age:" st
r
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Ag
u
ilar
git-rel
i
nk:
u
se a l
o
wercase "u
s
age:"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
g
it-svn: use a l
o
werca
s
e "usa
g
e:"
s
tring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
guilar
g
it-
s
h-setup: use a lowercase "usage:" stri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
Da
v
i
d
Aguila
r
t7800: "defaults"
is no longe
r
a
bui
l
tin tool name
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David Aguila
r
t
7800: modernize tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-20
David Aguilar
t7800: update
c
o
p
y
right notice
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-17
David Aguil
a
r
d
ifftool: silence uninitialized varia
b
le warning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
D
a
v
i
d A
g
uilar
p4merge: fix p
r
intf
usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
Dav
i
d A
g
uilar
difftool--helper: fix printf usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David Aguilar
d
oc: g
e
nerate a l
i
st of valid merge
tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David Aguilar
me
r
g
e
tool--lib: add fun
c
tions for finding
a
v
aila
b
l
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
D
avid Agui
l
ar
mergetool--li
b
: i
m
p
r
o
ve
t
he help te
x
t i
n
gue
s
s
_
m
e
rge_tool()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David
A
gu
i
lar
mergetool--lib: simpl
i
fy command expre
s
si
o
ns
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Aguil
a
r
m
e
rgeto
o
ls: simplify how
we han
d
le
"vim" and "defa
u
l
t
s"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David Aguilar
mer
g
etool--
l
ib: improve show_t
o
o
l_help() outpu
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David
A
guilar
mergetool
s
/v
i
m:
r
emove redundan
t
diff command
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-12-27
David Aguilar
m
e
rgeto
o
ls/p
4
merge: Honor $TMPDI
R
for the /dev/null
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-10-11
Da
v
id Aguilar
merget
o
ols/p4merge: H
a
ndle "/dev/null"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
David
Agui
l
ar
m
e
rgetool--lib:
Allow custo
m
commands to ove
r
ride buil
t
-in
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
D
a
vid A
g
u
ilar
git
k
: Rename 'tagcontents' t
o
'cached_tagcontent'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
Da
v
id Aguilar
gitk: Teach "Rere
a
d references" to reload
t
a
gs
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
David Aguilar
mergeto
o
l,difftool: Documen
t
-
-tool-help consistently
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
Da
v
id Agu
i
lar
difft
o
ol: Disable --symlinks
o
n
cygw
i
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguila
r
diff
t
ool
:
Hand
l
e compare() returning -1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David
A
gu
i
lar
dif
f
tool: Wrap long lin
e
s for readabili
t
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
D
avid Aguilar
di
f
ftool: Check a
l
l return c
o
des from compare
(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David A
g
uilar
difft
o
ol: Handle findin
g
merge
t
ools/ in a path with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftool: Use
s
ymlinks when diffi
n
g aga
i
nst the work
t
ree
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
di
f
ftool: Ca
l
l the temp
d
irec
t
ory "g
i
t
-difftool"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David
A
gu
i
l
a
r
difftool: Move o
p
tio
n
values int
o
a has
h
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
diff
t
o
o
l
:
Elimina
t
e global
vari
a
b
le
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
dif
f
tool:
Sim
p
lify
print_tool_help
(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
David
A
guil
a
r
t7800: Test
d
if
f
tool passing
arguments to dif
f
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
David Agui
l
ar
mergetool: Provide an empty file w
h
en need
e
d
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
Da
v
id Aguil
a
r
Makef
i
le: I
m
pr
o
ve compi
l
er header depe
n
dency check
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Da
v
id
Aguilar
mergetools/meld:
Us
e
'--o
u
t
put' when available
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Dav
i
d Ag
u
il
a
r
mergetool--lib: Refa
c
tor tools into separa
t
e files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Agu
i
lar
m
ergetool--lib:
M
ake styl
e
co
n
sistent with gi
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next