repo.or.cz
/
git
/
platforms.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge-recursive: mark rename/delete conflict as unmerged
2008-12-25
Johannes Sc
h
indelin
merg
e
-recurs
i
v
e:
m
ark re
n
a
me/del
e
te conflict as u
n
mer
g
ed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-25
Junio C Hamano
G
I
T 1
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-24
Junio C
H
aman
o
M
e
rg
e
branch 'js/rebase-i-p'
commit
|
commitdiff
|
tree
2008-12-24
Johan
n
e
s S
c
hindeli
n
reb
a
se -i -p:
l
eave
a
--cc
patch when a merge coul
d
.
.
.
commit
|
commitdiff
|
tree
2008-12-23
M
i
klos Vaj
n
a
t9
1
29: skip the last three
t
e
s
t
s
if UTF-8 l
o
cale is
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-22
J
u
nio C
H
a
mano
GIT
1
.
6
.
1-rc
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-22
Richard Hartmann
Always show which directory
i
s not
a
git repository
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-22
R
i
chard Hartmann
Make help
e
n
t
ries alphabetic
a
l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-22
Junio
C
Hamano
Merg
e
branch
'
maint'
commit
|
commitdiff
|
tree
2008-12-22
Bo
y
d Ste
p
h
e
n Smith
J
r
git-r
e
vert documentati
o
n: refer to
new HOWTO on revert
i
ng
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-22
R
obin
Rosenberg
g
i
t-revert: record the
p
arent against which a revert
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-22
Junio C Hamano
Merge git
:
//git
.
kernel
.
o
rg/pub
/
scm/gitk/
g
it
k
commit
|
commitdiff
|
tree
2008-12-21
M
a
rkus Heidelberg
d
o
c/
g
i
t-
f
s
c
k
:
c
h
ange th
e
way fo
r
g
etting heads' S
H
A1s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-21
Markus H
e
id
e
lbe
r
g
Documentation
/
git-show-branc
h
: work around "single
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-21
Jun
i
o C Hamano
send-email: futureproo
f
split_addrs() sub
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-21
Junio C Ha
m
ano
Ma
k
e sure lock
f
il
e
s are unlocked wh
e
n dyi
n
g on
S
I
G
PIPE
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-21
René S
c
h
a
rfe
fast-import
.
c: s
t
ric
t
er strtoul chec
k
,
silence c
o
mpile
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-21
René S
c
harfe
c
o
nne
c
t
.
c: st
r
ict
e
r
po
r
t validation, silen
c
e c
o
mpil
e
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-21
Nanako Shiraishi
Add a
documentat
on h
o
w
t
o
revert a faulty
me
r
ge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-21
Kirill A
.
Korins
k
i
y
Remov
e
the requir
e
m
e
nt o
p
aquelocktoken uri scheme
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-21
Marcel
M
.
Cary
gi
t
-sh-set
u
p
: Fix sc
r
ipts
w
hose PW
D
i
s a sym
l
ink into
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-21
Johannes
S
ixt
rebas
e
-i -
p
:
F
ix --c
o
ntinue after a merg
e
coul
d
not
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-21
Johannes Sixt
S
h
ow a
failure of reba
s
e -p
i
f the me
r
ge had a confli
c
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
Marku
s
H
eidelberg
Documentat
i
on: fix typos, gramma
r
, asciidoc synt
a
x
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
Junio
C
Hamano
Me
r
ge branch 'mai
n
t'
t
o syn
c
with
G
I
T 1
.
6
.
0
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
Junio C Hamano
G
IT 1
.
6
.
0
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
Junio C Hamano
fast-import:
m
a
ke
t
a
g
ger in
f
ormation optional
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
J
o
h
annes Schindelin
fast-
e
xp
o
rt: deal with tag obje
c
ts that do not
h
a
ve
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
M
iklos Vajna
Submit
t
ingPatc
h
es: ment
i
o
n
the usage o
f
re
a
l
name in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
David Aguilar
git
-
mergetool: properly handle "gi
t
mergetool -- fi
l
e
name"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
Wu Fe
n
g
g
uang
g
i
t-send-email: handle email address with quoted
comm
a
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
Markus Heidelberg
Docu
m
entat
i
on: fix typo
s
, gramm
a
r, as
c
i
i
d
o
c syntax
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-19
M
a
rkus Heidelb
e
r
g
Documentation:
sy
n
c exa
m
ple ou
t
pu
t
w
i
t
h git o
u
tput
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-18
Re
n
é Sch
a
rfe
Fix t
y
pe-m
i
sma
t
ch compil
e
r warning from diff_populate_file
s
p
e
c
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-18
Mic
h
a
e
l J
Gruber
tes
t
over
l
apping ign
o
re patterns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-18
Junio C Hamano
Merg
e
branch 'lt/readlink'
commit
|
commitdiff
|
tree
2008-12-18
A
rjen L
a
a
r
hoven
Enab
l
e
threaded
d
elta
s
earch on Mac OS
X
/Da
r
win
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-18
Nanako Shirais
h
i
Cla
r
i
fy docum
e
ntation of "git c
h
e
c
kout <tree-ish> paths
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-18
Junio C Hamano
Me
r
ge git://repo
.
or
.
cz/git-
g
u
i
commit
|
commitdiff
|
tree
2008-12-17
Mi
k
l
os Vajn
a
githooks document
a
tion: add a n
o
te about
th
e
+x mod
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Junio C Hamano
combine
-
diff
.
c: use strbu
f
_readlink()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Junio C H
a
mano
b
uilt
i
n
-blame
.
c: use strbuf_readl
i
nk()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Junio C Hamano
m
a
ke_abso
l
ute_path(
)
:
check bounds when seeing a
n
overlon
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Linus T
o
rvalds
Mak
e
'p
r
epar
e
_temp_file()' ignore
st_s
i
ze
f
or s
y
ml
i
nks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
L
inus Torvalds
Make 'dif
f
_populate
_
filespec()
'
use the new
'strbuf_
r
e
adli
n
k()'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
L
inu
s
T
o
rvalds
Make 'index_path()' us
e
'strbuf_read
l
i
n
k
(
)'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
L
inus Tor
v
alds
Ma
k
e
'ce_comp
a
re_link()
'
u
s
e the
n
ew
'
st
r
buf_re
a
dlink()'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
L
i
nus Torvalds
Add generic 'strbuf_r
e
a
d
link()'
helper
function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
M
ar
k
u
s
Heidelberg
doc/git-reset:
a
dd
reference to git-stash
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Markus Heidelberg
D
o
c
u
mentation: fix description f
o
r enabling hooks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Mik
l
os
V
ajna
g
i
t-daemon doc
u
mentation: us
e
{tild
e
}
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Junio C Hamano
g
itwe
b
: do not run "git diff" that
is
P
orcelain
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Junio C Hamano
GIT 1
.
5
.
6
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
J
u
n
io C Hamano
GIT 1
.
5
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Junio C Hamano
GIT 1
.
5
.
4
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
J
unio C Ham
a
no
g
itweb: do n
o
t run "git diff" th
a
t is Po
r
celain
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-16
Lee Marlow
bash c
o
m
p
letion: Sync config v
a
riables wit
h
t
heir man
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-16
Lee
Marlow
b
ash comp
l
etio
n
: Sort config comp
l
e
t
ion variables
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-16
Junio C
Hamano
Merge branch
'ma
i
nt'
commit
|
commitdiff
|
tree
2008-12-16
J
o
h
a
nnes
S
chindelin
fas
t
-import: close p
a
ck before
un
l
inking it
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-15
Juni
o
C Ham
a
no
pa
g
er: d
o
not
dup2 std
e
r
r if
i
t
is already redirected
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-15
Junio C Hamano
git-
s
how:
d
o n
o
t
segfau
l
t w
h
e
n showing
a bad tag
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-15
Jo
h
annes
Schindelin
Get rid of
the last remnants of GIT_CO
N
FIG_LOCAL
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-15
Al
e
xander Gavrilov
Documen
t
at
i
o
n: Describe
git-
g
ui To
o
ls menu
configur
a
tion
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-15
YONETANI T
o
mokazu
git-fast-i
m
po
r
t possibl
e
memory corruption problem
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-13
Ma
r
kus Heidelber
g
builtin-commit: remove unused
message
v
ariable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-13
Junio C Hama
n
o
Merge b
r
anch 'm
a
int'
commit
|
commitdiff
|
tree
2008-12-13
Brandon Casey
git-b
r
anch: displa
y
s
h
a
1
on branch deletion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-13
Jim Meyering
git-config
.
txt: fix a typ
o
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-11
Junio C Haman
o
Merge
b
ranch 'main
t
'
commit
|
commitdiff
|
tree
2008-12-11
Linus Torvalds
fsck: reduce stack fo
o
t
print
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-11
Jeff King
r
eba
s
e: improve
e
rr
o
r
m
e
ssages about dirty state
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-11
Nicolas Pitre
m
a
k
e sure p
a
c
k
s to be replaced
a
re closed befor
e
hand
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
Al
e
xande
r
Pot
a
shev
Fi
x
typo in comm
e
nt i
n
builtin-add
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
Junio C H
a
mano
Fi
x
t4031
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
Junio C Hamano
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2008-12-10
Jeff King
diff:
r
espect textconv in re
w
rite diffs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
J
e
ff Kin
g
diff:
f
ix ha
n
dling
of
b
inary rewrite diffs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
A
l
exander Potashev
Fix typos in documentation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
Tor Arvid Lun
d
git-p4
:
Fix regre
s
sion in p4Where
m
ethod
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
Ralf W
i
ldenhues
Improve
l
ang
u
a
g
e in git-me
r
ge
.
txt and re
l
ated docs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
Juni
o
C Ha
m
ano
work arou
n
d
Pytho
n
warnings f
r
om AsciiDoc
Signed-off-by:
Junio C Hamano
<junio@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-09
Alex
e
y Borzenkov
Defin
e
lin
k
git macr
o
in [macros] sectio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-09
Deskin Miller
git-svn: Make following parents at
o
mic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-08
Jakub Narebsk
i
gitweb:
Fix bug in insert
_
file() subroutine
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-08
Jeff King
diff: al
l
ow tu
r
n
i
ng on textc
o
nv explicit
l
y for
p
lumbing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-08
J
eff
King
r
e
order ALLOW
_
T
EXTCON
V
option s
e
tting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-08
Junio C Hama
n
o
re
a
d-cache
.
c: typ
o
fix
in
c
omme
n
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-08
Junio C Haman
o
builtin-checkout
.
c: check error retur
n
f
rom re
a
d_ca
c
he(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-08
Junio
C
Ham
a
no
Point "stale" 1
.
6
.
0
.
5 docum
e
ntation from the main git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-08
Jun
i
o C Ham
a
no
Re
v
er
t
"git
-
stash: use git
rev-parse -q"
commit
|
commitdiff
|
tree
2008-12-07
Junio C
H
a
ma
n
o
Update d
r
a
f
t release notes
for
1
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-07
Junio C
Hamano
Me
r
ge branch
'maint
'
commit
|
commitdiff
|
tree
2008-12-07
Juni
o
C Haman
o
GIT 1
.
6
.
0
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-07
M
a
tt Mc
C
utchen
"git diff <tree>{3,}": d
o
not reverse orde
r
of argumen
t
s
commit
|
commitdiff
|
tree
2008-12-07
Jeff K
i
n
g
tag:
delete TAG_EDITMSG only
o
n successful t
a
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-07
Jakub Narebs
k
i
gitweb:
Make project
s
pe
c
if
i
c over
r
id
e
for 'grep' feat
u
re
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-07
M
i
k
los
Vaj
n
a
h
t
tp
.
c: use 'git_confi
g
_string' to get 'curl_http_pr
o
xy'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-07
Tho
m
a
s R
a
s
t
fe
t
ch-pack: Avoid memc
p
y() with
s
rc==dst
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-06
Junio C
Hamano
Update draft releas
e
notes to 1
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next