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
read-cache: add and then use tweak_split_index()
2016-12-12
David
Aguilar
mergetools
:
fix xxdiff hotke
y
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-08
Dav
i
d Aguilar
difftool: fi
x
dir-
d
iff index cr
e
ation wh
e
n in
a subdirectory
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-11-29
David
A
guilar
mergetools/vimdiff: trust
V
i
m
'
s exit
c
o
de
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-11-29
David Aguilar
mergetool: hon
o
r mergeto
o
l
.
$to
o
l
.
tr
u
stExitCode
for
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
David Aguilar
m
e
rge
t
ool: hono
r
-O<
o
rd
e
rfile>
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
David Agu
i
lar
mer
g
etool:
h
o
nor
d
iff
.
orderFile
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
D
a
v
id Aguilar
mergetool: move mai
n
pro
g
ram
f
low
int
o
a main() functio
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
David A
g
u
ilar
mer
g
e
t
ool: add co
p
y
right
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
D
av
i
d Aguilar
difftool: use
G
it::* functio
n
s ins
t
ead o
f
passing around
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
David Aguilar
difftool: avoid $GIT_D
I
R and $GIT_W
O
RK_TREE
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
Da
v
id Agu
i
lar
su
b
tree:
adj
u
st function definitions
t
o
match Cod
i
ngGuidelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
David Aguilar
s
u
btre
e
: a
d
just style t
o
mat
c
h CodingGuidelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-26
David
A
guilar
subtree
:
fix
"git subtree split --rejoin"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-26
David Aguilar
t7900-subt
r
ee
.
s
h
:
fix quoting and broken && ch
a
ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-05-16
David
A
guilar
di
f
f
too
l
: handle unmerged fil
e
s
i
n dir-diff mode
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-05-16
Da
v
id Aguilar
difftool: initialize variables f
o
r readabili
t
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-03-10
Dav
i
d
Aguilar
mergetool: honor
temp
f
i
l
e
configurat
i
o
n when reso
l
v
i
ng
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-03-10
Da
v
id Aguil
a
r
mergeto
o
l: support d
e
let
e
/
d
elete
c
onflicts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-10-29
D
a
v
id Aguilar
difftool: ignore s
y
mbolic links
in use_w
t
_fil
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-07-23
David Agui
l
ar
contrib/subtree:
i
gnore log
.
date
confi
g
uration
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
David
Agui
l
ar
m
e
rgetools: add winmerge as a builtin t
o
ol
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
David Agu
i
l
a
r
mergetool-
-
lib: s
e
t IFS for difftool an
d
me
r
getool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
D
avid Agui
l
ar
mergetools: stop setting $
s
tatus
in merge_cmd
(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
Da
v
i
d Aguilar
m
ergetool: simpl
i
fy cond
i
t
io
n
als
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David
Aguilar
difftool--
h
elper:
a
dd
explicit exi
t
stat
e
me
n
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David Aguilar
me
r
g
etool--lib
:
remove use o
f
$status globa
l
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-14
Da
v
id
Aguilar
d
i
fftool: honor --trust
-
e
xi
t
-
c
ode
for builtin tool
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-28
D
avid Aguilar
difft
o
ol: add support fo
r
--trust-exit-code
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David
Aguil
a
r
t7610-merge
t
ool: add t
e
st cases for me
r
g
etool
.
writ
e
ToTemp
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
mergetool: add
a
n
option for
writ
i
ng
to a
t
emporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Ag
u
i
l
a
r
merg
e
tool:
use more conse
r
vative
temporary filenames
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Agu
i
la
r
t
e
s
t
-lib-functions
:
adjust style t
o
match CodingG
u
ide
l
i
nes
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
t7610-me
r
getool:
u
se test_config to isolate te
s
ts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
mergeto
o
ls/meld: make usage of `--output` conf
i
gurable
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguila
r
g
i
t-sh-s
e
t
u
p: move GIT_DIR
ini
t
i
ali
z
ation in
t
o
a function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
Da
v
id Agui
l
ar
m
erg
e
too
l
: use more conservat
i
ve temp
o
rary filename
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
te
s
t-l
i
b-functions: adjust s
t
yle to m
a
t
c
h C
o
d
i
ngGuidelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David
Aguilar
t7610-merget
o
ol: pref
e
r test_config over git config
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
t7610-mergetoo
l
:
a
d
d missin
g
&&
a
nd remove commented
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David
A
guil
a
r
t7610-mergetool: use tabs inst
e
ad
o
f a mix of tabs
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-07
Davi
d
A
g
uilar
completion: add
-
-show
-
s
i
gnatu
r
e
f
or
l
o
g
and show
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
David Aguilar
s
ta
s
h: pr
e
fer --quiet o
v
er shel
l
redi
r
ection of the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
Da
v
id Aguilar
refs:
m
ake
r
ev-
p
arse
-
-
quiet a
c
tual
l
y
quiet
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-16
David Agu
i
l
ar
t
1
50
3
: use
test_must_be_e
m
pty
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
David Aguilar
Documentat
i
on:
a note about s
t
do
u
t f
o
r
git r
e
v-parse
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
David Agu
i
la
r
clea
n
u
p
s: ensure
t
h
at g
i
t-compat-uti
l
.
h is
i
ncluded
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-02
David Aguilar
stylefix
:
a
ster
i
s
ks
stick to th
e
v
ariable, not the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-27
D
avi
d
Ag
u
ilar
g
i
tk
:
Catch mkdtemp errors
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
David Aguilar
gitk:
U
se mkt
e
mp -d to avoid predictable tempo
r
ary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
D
avid
A
g
uilar
g
i
tk: Honor TMPDIR when viewing external diff
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-02-24
David A
g
uilar
difftool:
s
uppo
r
t repos
i
torie
s
wit
h
.
git
-
fi
l
es
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
David Aguilar
pull:
a
dd
-
-
f
f-o
n
l
y
to the help text
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
David Aguil
a
r
pull: add p
u
ll
.
ff configuration
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-21
Dav
i
d Aguilar
i
m
ap-send: eli
m
inate
H
M
AC
deprecation warnings o
n
Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David Aguilar
c
a
che
.
h
:
eliminate SHA-
1
deprecation warnings o
n
M
a
c
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
D
avid Aguilar
Makef
i
le: add su
p
port f
o
r Apple CommonC
r
ypto fa
c
il
i
ty
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-11
D
avid Aguilar
Makefile: fix
d
efault regex sett
i
ngs on Darwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-09
D
a
vid Aguilar
mergetoo
l
s/kdiff
3
: do not u
s
e --auto wh
e
n
d
i
ffing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-04-16
Dav
i
d Aguilar
h
elp
.
c: add a co
m
patibility
c
o
m
ment to
c
m
d_v
e
rsi
o
n()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
D
a
v
i
d Agu
i
lar
contrib/mw-to-git/
t
/
in
s
ta
l
l-wiki
.
s
h: use a lowercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
D
avid A
g
ui
l
ar
c
ontrib/examples/git-remote
.
perl: use a lowerc
a
s
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Ag
u
ilar
tests:
use a lower
c
ase "usage
:
"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
D
a
vid Aguilar
git-svn
:
use a
l
owercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Agui
l
a
r
Documen
t
ation/user
-
manua
l
.
txt: use
a
lo
w
ercase
"
usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
templat
e
s/hooks-
-
upd
a
te
.
samp
l
e
:
use a l
o
we
r
case "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d A
g
uilar
contri
b
/hook
s
/se
t
gitpe
r
ms
.
perl: use a lowerc
a
se "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contrib/e
x
ampl
e
s:
u
se
a
l
o
w
e
r
c
ase "usa
g
e:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contri
b
/fast
-
import/i
m
port
-
zips
.
py: use spaces i
n
stead
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Aguilar
contrib/fa
s
t-import/import-z
i
ps
.
py: fix b
r
oken err
o
r
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Agui
l
ar
contri
b
/fa
s
t
-
impo
r
t:
u
s
e a low
e
rca
s
e
"usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Ag
u
ila
r
c
o
ntr
i
b/credential: use a
lowercase "us
a
ge:
"
strin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-cvsimport
:
use a lowercase
"usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid
A
gui
l
a
r
git-cvsim
p
ort: use
a
lowe
r
case "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
Aguil
a
r
git-cvs
e
xportc
o
mmit: use a lowercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
A
guilar
gi
t
-archimp
o
r
t:
u
se a
l
owerca
s
e "
u
sage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
u
ilar
git
-
merge-one
-
file: use a lowercase "
u
sage
:
"
s
tring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Aguilar
git-relink: use a lowercase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-svn: us
e
a
lo
w
e
rc
a
se
"
usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
Aguilar
g
i
t-sh-setup: use a lo
w
ercase "usage:
"
s
tring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
Da
v
id
Aguilar
t7800:
"def
a
ults" is no longer a builtin tool name
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David Ag
u
ilar
t7800: m
o
dernize tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-20
David A
g
u
i
lar
t7800:
update copyright no
t
ice
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-17
David Aguil
a
r
difftool: si
l
ence uninitializ
e
d
v
ariable warning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David Ag
u
i
lar
p4mer
g
e: fix printf usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
D
avid Aguila
r
di
f
ftool--he
l
per
:
fix
printf us
a
ge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David Aguilar
d
o
c
: generate a list
o
f valid me
r
ge
tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
D
avid Ag
u
il
a
r
merget
o
ol--
l
ib: add function
s
for fin
d
ing availabl
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
Da
v
i
d Aguilar
m
e
rgetool--lib: improve the help text in guess_merge_tool()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David
Agui
l
ar
merget
o
ol-
-
lib: sim
p
lify c
o
mmand expressions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
mergetools:
s
implify ho
w
we handle "vim" and "defaults"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
D
avid Aguilar
mergeto
o
l-
-
lib: improve show_t
o
ol_help
(
)
output
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David A
g
uilar
merge
t
ools/
v
im: remove
redundant d
i
ff command
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-12-27
David Aguilar
mergetools/p4merge: Honor $TMPDIR for the /dev
/
n
ul
l
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-10-11
Davi
d
Agui
l
a
r
mergetools/p4merge: Handle "/dev/null
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
D
avid A
g
uilar
m
e
rgetool
-
-lib:
A
l
low custom
commands to override built-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
Da
v
i
d Agui
l
ar
gitk: Rename 'tagconten
t
s' to 'cached_tagco
n
tent'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David Aguila
r
gitk:
T
each "R
e
read referen
c
es"
to reload tag
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
David Agui
l
ar
m
ergetool,di
f
f
t
ool: D
o
cume
n
t
--tool-hel
p
consistently
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
D
a
vid Aguil
a
r
difftool: Disable
--symlinks on
c
yg
w
in
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
Davi
d
Agui
l
ar
difftool: Ha
n
d
le compare() returning -1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next