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
Start the 2.46 cycle
2022-01-16
Da
v
id Agu
i
lar
bu
i
ld: centos/RHEL 7 ships with an old
e
r
gcc and zlib
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2021-10-13
D
avid Ag
u
i
lar
mergetoo
l
s/xxdiff:
p
reve
n
t segfaults from s
t
opp
i
ng
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2021-10-01
David Aguila
r
difftool: add a
miss
i
ng space
to
th
e
run_di
r
_diff(
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2021-10-01
David
A
g
uila
r
di
f
f
tool: remove an unnece
s
sary call to strbuf_release()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2021-10-01
David Aguilar
d
i
f
f
tool: refactor dir-diff to write files using helper
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2021-10-01
David Aguilar
difftool: cre
a
te
a
tmpdir path without rep
e
ated sla
s
hes
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2021-09-23
David Agu
i
l
a
r
difftool: fix symlink-file writing in dir-diff mode
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2021-06-02
David Aguilar
c
ontrib/com
p
let
i
on: fix zsh
c
ompl
e
t
i
on re
g
ression fro
m
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2020-12-01
David Agu
i
lar
git-gui: ssh-askpass: add a che
c
kbox
to show the input
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2019-04-04
David
A
guilar
contrib/comple
t
ion: ad
d
smerge to the merge
t
ool completion
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2019-04-04
David Agu
i
l
a
r
merg
e
tools: add supp
o
rt for
smerge (
S
ublime Merge)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-06-19
David Agui
l
ar
merg
e
tools/meld: improve comp
a
tibiilty wi
t
h Meld on
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-03-15
David Aguilar
difftool: handl
e
modif
i
ed
symlinks in d
i
r-d
i
ff
m
ode
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-03-15
David
Agu
i
l
ar
t7800: clean
u
p cruft
le
f
t behind by tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-03-15
Dav
i
d Agu
i
l
a
r
t780
0
: remove whitespa
c
e befor
e
redirec
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-02-08
D
avid Aguilar
t7800: repl
a
ce "wc -l" with t
e
st_line
_
count
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-02-08
D
a
vid Aguilar
t7800: simplify
bas
i
c usag
e
test
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-02-06
Dav
i
d
Agu
i
lar
difftool: fix
b
u
g when prin
t
ing
usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-01-18
D
avid Aguilar
gitk: Remov
e
translated message from comments
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
David
A
guilar
mergetools: fix xxdiff hotkeys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
David Aguilar
difftoo
l
: rename
variables f
o
r consistency
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
D
avid Ag
u
ilar
dif
f
too
l
:
c
hdir as early as possible
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
David Aguila
r
difft
o
ol: sani
t
ize
$
workdi
r
as ear
l
y as possible
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
D
avid Aguilar
dif
f
t
ool: fix dir-diff
ind
e
x creatio
n
w
h
en in a
subdi
r
ec
t
ory
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-08
David Aguilar
d
ifftool:
f
ix dir-d
i
ff in
d
ex
c
reation when in a subdirector
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-11-29
David
Aguilar
merg
e
to
o
ls/vimdiff
:
trus
t
Vim's exit code
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-11-29
David Aguilar
mergeto
o
l: honor me
r
g
e
t
ool
.
$
t
oo
l
.
tr
u
s
t
Ex
i
tCode fo
r
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
Da
v
id
A
guilar
mer
g
etool
:
honor -O<orde
r
file>
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
David Aguilar
mergetoo
l
: honor diff
.
o
rderFile
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
Davi
d
Aguilar
mergetool
:
move main pr
o
gram flow
i
n
t
o a main() function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
Dav
i
d A
g
uilar
merge
t
o
o
l: add copyright
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
David Aguilar
d
i
fftool: use Git::* functions inst
e
ad of pas
s
i
n
g around
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
Davi
d
A
g
u
ilar
difft
o
ol: a
v
o
i
d $GIT_
D
IR
and $
G
IT_WORK_TREE
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
David A
g
uilar
s
u
b
t
ree: adjust f
u
ncti
o
n
defini
t
ions
to m
a
t
ch Codin
g
Guidelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
D
avid Aguilar
su
b
tr
e
e:
a
djust style t
o
match CodingGuidelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-26
David Aguil
a
r
subtr
e
e: fix
"git subtree split --
r
ejo
i
n"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-26
David Aguilar
t7900-subtree
.
s
h
: fix quoting and broken && chains
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-05-16
D
avid
A
g
u
i
lar
difftool: handle unmerged files in dir-diff mode
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-05-16
D
avid Aguil
a
r
diffto
o
l: initialize variables for
r
eadability
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-03-10
David Agu
i
lar
merg
e
too
l
: honor tempfile config
u
ration when res
o
lving
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-03-10
David
A
gu
i
lar
m
ergetool: support delete
/
dele
t
e conflicts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-10-29
D
avid Aguilar
difftool: ign
o
re symbolic links
i
n use_wt_
f
i
le
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-07-23
David Aguilar
contrib
/
subtree: ignor
e
log
.
date configuration
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
D
avid Aguilar
m
e
rgeto
o
ls:
a
dd winmerge
as
a
builti
n
tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
Dav
i
d
Ag
u
ilar
mergeto
o
l
--l
i
b: set IFS for di
f
ftool and m
e
rgetoo
l
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
Davi
d
Aguilar
mergetool
s
: stop setti
n
g $s
t
atus in m
e
rge_c
m
d
(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
D
avid
Aguil
a
r
mergetool: sim
p
li
f
y c
o
ndi
t
ionals
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David Aguilar
difftool
-
-helper: add expl
i
ci
t
ex
i
t statement
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David Aguilar
mergetool--
l
i
b
:
remove use
of $status global
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-14
Davi
d
Aguilar
d
i
fftool
:
honor
-
-
t
rust-
e
x
i
t-code for bu
i
ltin
t
oo
l
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-28
David Ag
u
ilar
diffto
o
l: ad
d
sup
p
ort
f
or
-
-trust-e
x
i
t-co
d
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
D
avid Ag
u
i
l
ar
t
7
610-mergetoo
l
: add test c
a
ses for mergetool
.
writeToTem
p
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
Dav
i
d Aguilar
mergetool: add
a
n o
p
tion for writi
n
g
to
a
temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Agui
l
ar
m
ergetoo
l
: use m
o
re conservative temporary filenames
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David
Aguil
a
r
t
e
s
t
-
lib
-
f
u
nc
t
ions
:
adjust style
t
o
match Codi
n
gGuidelin
e
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
t7610-mergetool
:
use test_config t
o
isolate
tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
mergetools/
m
eld:
make usage of `--
o
utput
`
configurable
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David
A
gui
l
ar
git-sh-s
e
t
up:
m
ove GIT_DIR initialization into
a
funct
i
on
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
Davi
d
Aguilar
mergetool: use more c
o
nservative
temporar
y
filenames
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
D
avid Ag
u
ilar
tes
t
-lib-func
t
ions: adjust s
t
y
le to match
Coding
G
ui
d
eli
n
es
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David
A
g
u
ilar
t
7
61
0
-merget
o
o
l
:
p
r
efer
tes
t
_c
o
n
fig over git config
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
Dav
i
d A
g
u
i
lar
t
7610-mergetool: add m
i
ssing && and remove
commented
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
t7610-mergetoo
l
: us
e
tabs instea
d
o
f a m
i
x of tabs
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-07
D
a
v
i
d Aguilar
complet
i
on:
a
dd --show-si
g
n
a
t
ur
e
fo
r
l
og and show
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
David Agui
l
ar
sta
s
h
: p
r
efer
-
-quie
t
over shel
l
r
edir
e
c
tion of the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
David Aguilar
re
f
s: make rev-parse --quiet actually quiet
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-16
David Aguil
a
r
t150
3
:
use test_
m
u
st_be_empty
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
D
avid Aguilar
Doc
u
mentation
:
a
note
a
bo
u
t s
t
d
out
f
or git
rev
-
parse
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
David
Aguilar
cl
e
anups: ensure
t
hat git
-
co
m
pat-uti
l
.
h is
i
nclu
d
ed
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-02
Dav
i
d
Aguilar
s
tylefix: asterisks
s
tick to the var
i
a
b
le, no
t
the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-27
Da
v
i
d Ag
u
ilar
gi
t
k: Ca
t
ch mkdt
e
m
p
errors
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
David Aguilar
gitk: Use mkt
e
mp -d to avoid pr
e
dictable temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
D
avid Agui
l
ar
gitk: Honor TMPDIR wh
e
n viewing ex
t
ernal diffs
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-02-24
David
A
g
uilar
dif
f
t
ool: support repositories with
.
git-files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
David Agu
i
lar
pull: add --ff-onl
y
to th
e
help text
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
Davi
d
A
guilar
pull: add
pull
.
ff
conf
i
guration
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-21
Da
v
i
d Aguil
a
r
im
a
p-s
e
nd: eli
m
inate
H
MAC depre
c
a
t
i
o
n warnings on M
a
c
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David Aguila
r
cache
.
h: elim
i
nate SHA-1 deprecatio
n
w
a
rnings on
M
ac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David Aguilar
M
a
ke
f
ile:
a
dd support for App
l
e Common
C
r
y
pto facil
i
ty
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-11
David Aguilar
Makefil
e
: fix default regex settings on
Darwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-09
D
a
v
id
A
guilar
mergetools/kdi
f
f
3: do not use -
-
aut
o
when di
f
f
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-04-16
David Agu
i
lar
help
.
c: ad
d
a com
p
at
i
bility
c
omment to cmd
_
v
ersion()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
Dav
i
d
Aguilar
c
o
ntrib/m
w
-to-gi
t
/t/in
s
tall-wiki
.
sh: use a lo
w
ercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
Davi
d
Aguilar
contrib/examples/git-rem
o
te
.
perl: use a l
o
wer
c
a
se
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Ag
u
ilar
te
s
ts: use
a l
o
wercase
"
usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
git-sv
n
: use a lowerca
s
e
"usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Aguilar
Documentation/user-manual
.
txt: use a lowercase "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
i
d Ag
u
ilar
tem
p
la
t
e
s
/hooks--update
.
sa
m
p
le: use
a
lowercase
"
usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Davi
d
A
g
u
i
l
ar
contri
b
/hook
s
/s
e
tgitperms
.
perl: u
s
e a lo
w
e
rcas
e
"us
a
ge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Aguilar
contrib/examples: u
s
e a lowercase "usage:" str
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid A
g
u
i
lar
contrib/fa
s
t
-
impo
r
t/import-zi
p
s
.
py: use spaces ins
t
ead
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
gu
i
l
a
r
con
t
ri
b
/fast-import/import
-
zi
p
s
.
py:
f
i
x
broken error
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Aguilar
contrib/fa
s
t-import:
u
s
e a l
o
wercase "usag
e
:" stri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
guila
r
con
t
rib/cred
e
ntia
l
: use a lowercas
e
"u
s
age:" str
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id Aguilar
git-
c
vsim
p
ort: use a
lowercase "usage
:
" str
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
g
i
t
-cvsimport: use a lowercase
"
usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
uilar
git-c
v
sexp
o
r
tcommit: use a lowercase
"
usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Agu
i
lar
git-a
r
chimp
o
rt: use
a lowercase "usage:"
s
tring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Agu
i
lar
g
i
t-merge-one-
f
ile: us
e
a lower
c
ase "usage
:
" st
r
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Agui
l
a
r
git-relink: u
s
e a lowercase "usage:" stri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next