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 'rs/unify-is-branch'
2014-07-21
Charle
s
Bailey
Fix
c
ontrib/subt
r
e
e
Makefile
t
o
p
atch #!
line
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-07-01
Charl
e
s B
a
iley
filter-branch:
e
l
i
minate
d
upl
i
cate mapped parents
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-05-02
Charles Bai
l
ey
compat/b
s
wap
.
h: de
t
ect endianness o
n
mo
r
e
platfor
m
s
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Ch
a
rl
e
s
Bailey
te
s
ts: don't
r
ely
o
n
s
trer
r
or
t
e
x
t
wh
e
n
tes
t
ing rmd
i
r
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Charles Ba
i
ley
d
ir
.
c:
make git_
f
nma
t
ch() not inline
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2010-08-20
Charles Bailey
mergetool
:
Remove explicit
r
e
f
erences
to /dev/t
t
y
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
Cha
r
les
Bailey
stash tests:
s
tash can lose data in a fi
l
e
r
emoved
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Ch
a
rles Bailey
s
ta
s
h: Don't
o
verwri
t
e files t
h
a
t
have gone from the
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles Ba
i
ley
Doc
u
m
entation: De
s
c
ribe
other si
t
uations w
h
ere -z affects
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
C
h
arles Bailey
C
h
ange xdl_
m
erge to gener
a
te output even for nu
l
l
m
erges
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charl
e
s Bailey
t
6023:
me
r
g
e-file
fa
i
l
s to
o
u
tput
anything
for a degen
e
rate
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charl
e
s Bailey
mergetool: fix
run
n
ing merget
o
ol in sub-dire
c
tories
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
C
h
ar
l
es Bail
e
y
merget
o
ol: Add a t
e
st for running mergeto
o
l in a s
u
b
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Charles
B
ai
l
ey
mergetool: respect aut
o
cr
l
f
by u
s
ing che
c
kout-
i
nd
e
x
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charle
s
Bailey
merget
o
o
l
:
Don't k
e
ep t
e
m
p
or
a
ry merge
f
i
les unless
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charl
e
s
Bailey
merge
t
ool: Add prompt
to continue after faili
n
g
t
o
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charle
s
Bailey
Add
-y
/
--no-prompt option t
o
merg
e
tool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles Bailey
F
i
x
some tab/space inconsistencies in git-mergetool
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Charles
B
a
iley
git-archiv
e
: work
i
n
b
a
re r
e
pos
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Bailey
Mak
e
g
i
t a
r
chive respect
core
.
auto
c
rlf w
h
en creating
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Ch
a
r
l
es Bail
e
y
Add
n
e
w
test to demonstrate git archiv
e
core
.
auto
c
rl
f
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charl
e
s Ba
i
ley
merge-t
o
ol documentati
o
n
: describ
e
c
u
stom command
u
sage
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles Bailey
git-me
r
getoo
l
documentait
o
n: show tool
n
ames in typewriter
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charle
s
Bailey
A
d
d a ve
r
y ba
s
i
c
te
s
t script
f
or git mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Teach gi
t
m
erge
t
ool to u
s
e cu
s
t
om commands defined
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles
Bailey
Ch
a
n
ged an
in
t
erna
l
varia
b
l
e of mergetool to su
p
port
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Cha
r
le
s
B
a
ile
y
Tidy up
g
it m
e
rgetool's
ba
c
k
up file beha
v
iour
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Charles Baile
y
gitk: Fix the Ma
k
efile to
cope with
syst
e
ms
l
a
c
k
i
ng
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
C
harles Bailey
Re
m
ove old
generated files fr
o
m
.
git
i
gnore
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Charles Bailey
Fix git-instaweb breakage
on
M
acOS X d
u
e to the l
i
mited
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
C
h
arles Bailey
Fix c
l
one n
o
t t
o
ignore d
e
p
th when pe
r
formi
n
g a local
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree