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
docs: clarify what git-rebase's "-p" / "--preserve-merges" does
2014-07-01
Charles Bailey
f
ilter-b
r
anch: eliminate
duplicate
m
apped
pare
n
ts
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-05-02
Charles Bail
e
y
compat/bswap
.
h: dete
c
t
e
ndianness o
n
more pl
a
tfo
r
ms
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Charles Ba
i
ley
tests: don
'
t rely on s
t
r
e
rror text wh
e
n testing rmdir
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Charles Bail
e
y
dir
.
c: make git_fnmatch(
)
no
t
inline
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2010-08-20
Ch
a
rles B
a
i
ley
mergetool: R
e
mov
e
explici
t
r
e
fere
n
ces to
/
d
ev/tty
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
Charles Baile
y
stash
tests
:
stash can lose data in a file rem
o
ved
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles Bailey
st
a
s
h
:
D
on'
t
overw
r
ite
f
i
l
es that have gone from
t
he
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles Bailey
Documentati
o
n: Des
c
ribe
other s
i
tuations
where -z affe
c
ts
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
C
h
arles
B
ailey
Change xdl_merge to gen
e
rat
e
output e
v
en f
o
r nul
l
merges
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Cha
r
l
es Bailey
t6023: merge-file
f
a
ils to output anyth
i
n
g
f
o
r a
d
e
g
enerat
e
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
C
harl
e
s Bail
e
y
mer
g
etool: fix running mergetool in
sub-direc
t
ories
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charl
e
s Bailey
mergetool:
Add a test fo
r
running mergetool in a sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Charles Bailey
m
e
r
getool: res
p
ect
auto
c
rlf by using
chec
k
out-index
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles Bailey
merge
t
ool: Don't k
e
ep temporary
m
erge files unless
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles Bailey
m
e
r
g
etool: Add prompt to con
t
inue
a
f
t
er f
a
iling to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
C
harles Bailey
Add
-y/--no-pro
m
pt o
p
tion to mer
g
etool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles
B
a
i
ley
Fix so
m
e tab/space
inconsistencies in gi
t
-
m
er
g
etool
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Charl
e
s
B
ailey
git-ar
c
hiv
e
: w
o
rk in bare repo
s
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
C
h
arles Bai
l
ey
M
a
ke git archive respect core
.
au
t
ocrlf when
c
reati
n
g
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Ba
i
ley
Add new test
to
d
emonstra
t
e gi
t
archive
core
.
autocrlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles Bailey
merg
e
-too
l
documentation: describe custo
m
c
ommand usa
g
e
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles Baile
y
git-merget
o
ol docume
n
taiton: show toolnames in
t
ypewrit
e
r
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Cha
r
les Bailey
A
dd a very
bas
i
c test scri
p
t for git mergetoo
l
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles
B
a
iley
Teach
g
it m
e
rgetool
t
o use custom
com
m
a
n
ds d
e
fin
e
d
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charle
s
Bailey
Changed an inter
n
al
vari
a
ble of merg
e
to
o
l
to support
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
h
a
rles Bailey
Ti
d
y up
g
i
t
mer
g
e
t
ool's back
u
p file behaviour
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
C
h
a
rle
s
Bai
l
ey
gitk
:
Fix the Mak
e
file to cope with systems lacking
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Charles Bailey
Remove old generated files from
.
gitign
o
r
e
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Cha
r
les
B
ailey
Fix git-instaweb
breakage on
M
acOS X due to the lim
i
te
d
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Charles Bail
e
y
Fix cl
o
ne not to ig
n
ore depth when per
f
o
r
min
g
a
local
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree