repo.or.cz
/
alt-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 'js/branch-track-inherit'
2022-01-16
David Aguilar
build: centos/R
H
E
L
7
s
h
ips
wi
t
h
an o
l
der g
c
c and zl
i
b
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2021-10-13
Da
v
id Aguila
r
m
e
rge
t
ool
s
/xxdiff: prevent seg
f
aults from st
o
pping
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2021-10-01
Davi
d
A
g
uilar
di
f
ftool:
add a missing
s
pa
c
e to the
r
un_dir_d
i
ff(
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2021-10-01
D
a
v
i
d
Aguil
a
r
di
f
fto
o
l
:
remove an unnecess
a
ry call to strbuf_relea
s
e()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2021-10-01
David Agui
l
ar
d
i
fftool: refactor dir-diff to wr
i
t
e
file
s
using helper
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2021-10-01
David A
g
uilar
difftool: create a
t
mpdir path without repeated slashes
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2021-09-23
D
a
vi
d
Aguilar
difftool: fix sy
m
l
ink-file writing in dir-diff m
o
de
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2021-06-02
David Aguilar
contrib
/
com
p
letion: f
i
x zsh com
p
let
i
on regre
s
si
o
n
f
rom
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2020-12-01
Dav
i
d Aguilar
git-gui: ssh-askpass: add a checkb
o
x to show the input
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2019-04-04
Davi
d
Aguilar
c
o
ntrib/c
o
mpletion: add s
m
erge t
o
the mergetoo
l
completion
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2019-04-04
David Aguilar
mergetools: add s
u
pport for smerg
e
(Sublime M
e
rge)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-06-19
David Aguilar
me
r
g
e
tools/
m
eld: impro
v
e
compatibiilty with Meld on
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-03-15
David Aguilar
difftool: h
a
ndle modified symlin
k
s in dir-d
i
ff m
o
de
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-03-15
David Aguil
a
r
t7800:
c
le
a
n
u
p cru
f
t left behind b
y
t
e
st
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-03-15
D
a
v
id Aguilar
t
7800: rem
o
ve whites
p
ace
b
e
f
ore redirec
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-02-08
D
a
vid Aguil
a
r
t
7800: rep
l
ace
"wc -l" with test_line_count
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-02-08
David Aguilar
t
7
800: si
m
p
lif
y
basic usage test
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-02-06
D
a
v
id Aguilar
d
ifftool: fix bug
when printing usa
g
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2017-01-18
David Aguilar
gitk: Remove
transl
a
ted
message from c
o
mments
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
Davi
d
Agu
i
lar
me
r
geto
o
ls: fix xxdiff hotkeys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
Da
v
id
A
g
uilar
d
i
fftool: rename v
a
riables
f
or
c
onsiste
n
cy
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
David Aguil
a
r
difftool:
c
hdir as earl
y
as possible
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
Davi
d
Aguil
a
r
difftool
:
sanitize $wor
k
d
i
r
as early as
possible
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-12
D
a
v
id Aguilar
d
ifftool: fix dir
-
d
i
f
f index creation whe
n
in a
s
ubdirectory
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-12-08
D
avid Aguilar
diff
t
ool
:
fix dir-diff
index cr
e
ation whe
n
in a subdirectory
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-11-29
Dav
i
d
Aguila
r
merg
e
tools/vimdif
f
: tru
s
t
V
im's exit code
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-11-29
Davi
d
Aguilar
me
r
getool: honor me
r
getoo
l
.
$too
l
.
tru
s
tExit
C
ode
f
o
r
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
David A
g
uilar
me
r
get
o
ol: h
o
nor
-
O<o
r
derfile>
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
Davi
d
Aguilar
mergetoo
l
: honor diff
.
orderFile
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
David Aguil
a
r
m
ergetool:
m
ove ma
i
n
p
rogram flow
into a main() function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-10-11
Da
v
i
d Aguilar
m
e
rgetool: add copyright
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
David Aguila
r
di
f
f
too
l
:
u
s
e Git::* functions instead of
p
assing around
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
D
a
v
i
d Aguilar
difftool:
a
void $GIT_DIR and $G
I
T_WORK_TREE
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
David Aguilar
sub
t
r
e
e: adju
s
t
fu
n
ction definitions to matc
h
CodingGuidelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-28
Dav
i
d Aguila
r
subt
r
ee: a
d
just style to ma
t
ch CodingG
u
idelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-26
Dav
i
d Aguilar
subtree: fix "git subtree spl
i
t --rejoin"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-07-26
Da
v
id Aguilar
t
7
900-subtr
e
e
.
s
h
: fix quoting and broken && chains
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-05-16
Dav
i
d
A
g
uilar
d
ifft
o
o
l: handl
e
unme
r
ged f
i
les in d
i
r
-
di
f
f mode
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-05-16
Dav
i
d Aguilar
d
i
fftool:
initia
l
ize variables for
r
ea
d
ability
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-03-10
David Agu
i
lar
mergetool:
honor tempfile con
f
iguratio
n
when reso
l
ving
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2016-03-10
David Ag
u
ilar
m
erget
o
o
l:
suppo
r
t
de
l
e
t
e/
d
el
e
t
e
confl
i
cts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-10-29
D
a
vid Aguilar
difftool:
i
gnore
symbolic links in us
e
_wt_file
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-07-23
Davi
d
Ag
u
i
lar
contrib/subtree: i
g
nore log
.
date
configurat
i
on
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
David Aguilar
merget
o
ols:
a
dd w
i
nmerge
a
s a
b
uilti
n
tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2015-05-20
Da
v
id
Agui
l
ar
me
r
geto
o
l
-
-li
b
: se
t
I
F
S for difftool and
m
e
rgetool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David Ag
u
ilar
mergetools:
s
top set
t
i
n
g $status
i
n m
e
rge_cmd()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David Aguilar
mergetool
:
s
implify con
d
ition
a
ls
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
David Aguilar
difftool--helper: add expl
i
cit
exit
sta
t
ement
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-21
D
avid Agu
i
lar
merg
e
tool--lib: re
m
ov
e
use of $status
g
lobal
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-11-14
David Ag
u
ilar
d
ifftool: honor --trust-
e
xit-code for bui
l
t
i
n tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-28
Davi
d
Aguilar
di
f
ftool: add support
f
or --trust-exit-code
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
t76
1
0-merge
t
ool: add t
e
st cas
e
s f
o
r mergetoo
l
.
writeToTemp
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Ag
u
i
l
ar
mergetool
:
add an opt
i
on for wr
i
ting to
a
temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
D
a
vid Ag
u
ilar
mergetoo
l
:
use more conserv
a
tive temporary filename
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
D
a
vid A
g
uilar
test
-
lib
-
functions:
a
djust style to match CodingGu
i
delin
e
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguila
r
t7610-me
r
g
etool: use test_config to isol
a
t
e tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-16
David
A
g
uilar
m
ergetools/
m
eld: ma
k
e usage of `--output` configurable
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
git-sh-setup: move GIT_DIR initializ
a
tion
i
nto a fu
n
ction
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David
Agu
i
lar
merge
t
ool
:
u
se more con
s
ervative tempora
r
y
file
n
ames
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
test-l
i
b-func
t
ions: a
d
ju
s
t style to matc
h
Codin
g
Guidelines
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David
A
guilar
t7610-mergetool: p
r
efer test_confi
g
over git co
n
fig
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
D
a
vid Aguilar
t761
0
-mergetool: add
miss
i
ng
&& and remove
commented
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-15
David
A
guilar
t
7610-
m
e
rgetool: use
t
abs
i
nste
a
d of
a
mix of tab
s
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-10-07
David Aguilar
completion: ad
d
-
-show-sign
a
tu
r
e for
l
o
g
an
d
sho
w
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
David Agui
l
ar
s
tash: prefer --qui
e
t over
s
hell redirec
t
ion of the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-19
David Aguilar
r
efs: m
a
k
e
r
ev-parse --qu
i
et actu
a
l
l
y
quiet
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-16
David Ag
u
il
a
r
t1503: u
s
e
t
est_
m
ust
_
be
_
e
mpty
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
Dav
i
d Ag
u
il
a
r
Docume
n
tation: a note
a
bout stdout for git r
e
v
-pa
r
s
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-15
David Agu
i
lar
c
l
eanu
p
s: ensur
e
that git-c
o
mpat-u
t
il
.
h
is included
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-09-02
Da
v
id Aguilar
styl
e
fix: as
t
erisks stick to the variable, not the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-27
Dav
i
d A
g
uilar
gi
t
k
: Catch
mkdtemp errors
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
David
A
guilar
gitk:
Us
e
m
k
temp
-d to avoid predictable temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-06-15
David Aguila
r
gitk:
H
onor
T
MPD
I
R when viewing external
di
f
fs
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-02-24
Dav
i
d Agu
i
l
a
r
diffto
o
l
:
support
reposito
r
i
e
s with
.
git-files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
D
a
vid Aguilar
pull: add -
-
ff-only to the help text
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
David
A
gui
l
ar
pull:
ad
d
pul
l
.
ff configu
r
ation
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-21
David Aguilar
imap-send: elim
i
nate H
M
AC d
e
precation warni
n
gs
on
M
ac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David Aguilar
cache
.
h:
e
limi
n
ate SHA-1
d
eprecat
i
on wa
r
nings on
Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
Dav
i
d
Aguilar
Makef
i
le:
a
dd support for Apple CommonCrypto facility
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-11
David Aguilar
Makef
i
le:
fix default regex se
t
tings on Darwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-09
David Aguilar
me
r
geto
o
ls/kdiff3: do not use --au
t
o
when d
i
f
fing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-04-16
D
avid Aguilar
help
.
c: add a
c
ompatibil
i
ty comment t
o
cmd_ve
r
sion(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
Da
v
id Ag
u
ilar
contrib/mw-to
-
git
/
t/
i
nstall-wiki
.
sh: use a lowerc
a
se
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
Davi
d
Aguilar
contrib/e
x
ample
s
/g
i
t-remote
.
perl:
u
se a lowerca
s
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
D
a
vid Aguilar
te
s
ts: use a lo
w
ercase "us
a
ge:" strin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
D
a
vid
A
guilar
git-svn
:
use a lower
c
ase "us
a
ge:" str
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
Aguilar
Documentation/use
r
-manual
.
tx
t
: u
s
e
a lo
w
ercase "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Agu
i
l
ar
temp
l
a
tes/hooks
-
-update
.
sample: use a lowe
r
case
"usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Ag
u
i
lar
c
ontri
b
/hooks/
s
etgitperms
.
perl
:
use a lowercase "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Agui
l
ar
c
o
ntrib/example
s
:
u
s
e a lowercase
"usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Ag
u
ilar
contrib/fast-import/import-z
i
p
s
.
py:
u
se s
p
aces ins
t
e
a
d
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Aguilar
contri
b
/fast-import/import-zips
.
p
y: fix b
r
oken e
r
ror
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contrib/f
a
st-impo
r
t: use a lo
w
er
c
ase "usage
:
" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Aguilar
con
t
r
i
b/credenti
a
l
: use a lo
w
erc
a
se "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
Aguilar
g
it-cv
s
import: use
a lower
c
a
se "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
uilar
git-cvsimport: use a lowercas
e
"
usage:"
str
i
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-
c
vs
e
xportcommit: us
e
a low
e
r
c
a
se "usa
g
e
:" stri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Agui
l
ar
git-archimport:
u
se a lowercase "u
s
age:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Agu
i
lar
g
it-merg
e
-
one-file:
u
se a
lowe
r
ca
s
e "us
a
g
e:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Agu
i
lar
git-reli
n
k: use a lowerca
s
e "
u
sage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next