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 'da/subtree-date-confusion'
2015-07-17
Charles Bailey
untracked: fix detection of uname(2) failure
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-06-25
Charl
e
s Bailey
Fix definition of
A
RRA
Y
_
SIZE for non-gcc
bu
i
lds
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-06-22
Charles Baile
y
cont
r
ib/subtree: sm
a
l
l
tidy-up to test
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-06-22
C
h
arles Bailey
contrib/subtr
e
e
:
fix b
r
oken &&-chain
s
a
nd revea
l
ed
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-06-22
Charl
e
s B
a
iley
contrib/
s
ub
t
ree:
u
se tabs
consit
e
ntly for indentat
i
on
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-06-22
Charles Ba
i
l
e
y
parse-options: move unsigned long option p
a
rsing out
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-06-22
Charles B
a
iley
test-p
a
rse-optio
n
s: upd
a
te to
handle nega
t
ive ints
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-10-15
Char
l
es Baile
y
di
f
f
t
ool: don't assume that default sh is san
e
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-10-15
C
harl
e
s Bailey
mergetool:
do
n
't require
a work tree for
--tool-help
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-07-21
Char
l
es Ba
i
le
y
Fix contrib/subtree
M
akefil
e
t
o patch #! line
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-07-01
Charles
B
ailey
f
ilter-branch: eliminate duplicate mapp
e
d
parents
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-05-02
Ch
a
rles
B
aile
y
compat/bswap
.
h:
d
etect e
n
dianness o
n
more p
l
a
tforms
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Charles Bailey
t
e
s
t
s: don't r
e
ly on st
r
err
o
r
t
ext whe
n
te
s
ti
n
g
r
mdir
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
C
harles
B
ailey
dir
.
c:
make
g
it_
f
nmatch() n
o
t inline
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2010-08-20
C
harl
e
s Bailey
mergeto
o
l:
R
emove exp
l
ici
t
r
ef
e
rences to /
d
ev/tty
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
Charl
e
s Bailey
stas
h
tests:
s
tash
c
an lose da
t
a in a
file removed
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Char
l
es Bailey
stash: Don't
o
verwrite file
s
that h
a
ve gone from t
h
e
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles Bailey
Docum
e
ntat
i
on: Des
c
ribe oth
e
r situations where -
z
affects
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles Bailey
Change xd
l
_merge to genera
t
e
o
u
tput even
for null merges
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Cha
r
le
s
B
a
iley
t6023: me
r
ge-f
i
le f
a
i
ls to
o
utput anyt
h
in
g
f
or a degenerate
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
C
h
arle
s
Bailey
merget
o
ol: fix
runn
i
ng me
r
getool in su
b
-directories
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles Bail
e
y
m
e
rgetool: Add a test
for runn
i
ng merg
e
tool in a sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Charles Bailey
mergetool: r
e
spect autocrlf
b
y u
s
ing c
h
eckout-index
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
C
h
ar
l
es Bailey
mergetool: Don't
k
eep tempor
a
ry merge files u
n
less
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charle
s
Bailey
m
erge
t
ool: Add
pr
o
mpt to continu
e
afte
r
f
a
i
ling to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Char
l
es Bailey
Add
-
y/--no-prompt option
t
o mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Cha
r
les Bail
e
y
F
ix some
t
a
b/sp
a
ce incons
i
s
t
encies in git-mergetool
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Charl
e
s Bai
l
ey
git-
a
rchive:
w
ork in bare repos
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Bailey
M
ake git archive respect core
.
autocrlf when creating
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Bailey
A
dd new test to demonstrate git ar
c
hive
c
or
e
.
a
u
tocrlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charl
e
s Bailey
mer
g
e-tool
documentat
i
on: des
c
ribe cust
o
m command usage
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles
Bailey
git-mergetool document
a
iton: show tooln
a
mes in ty
p
ewri
t
er
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
A
d
d a ver
y
basic
tes
t
script for
g
it mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
harle
s
Bailey
Teach git mergeto
o
l to us
e
cu
s
tom com
m
a
n
ds defined
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
harles Bailey
Ch
a
nged
an internal variable of mergeto
o
l
to suppor
t
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
h
arles
B
aile
y
Tidy up git
m
erg
e
tool
'
s back
u
p file behavio
u
r
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Charles Bailey
git
k
: Fi
x
the Makefi
l
e to cope with sy
s
te
m
s
l
acki
n
g
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Ch
a
rles
B
a
iley
Remove old gene
r
ated fi
l
es
from
.
gi
t
ignore
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Charles Bailey
Fi
x
git-
i
nstawe
b
break
a
ge on MacO
S
X due
t
o the limited
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
C
h
ar
l
es Bailey
Fix clone not
to igno
r
e de
p
th wh
e
n
p
erforming a l
o
cal
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree