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
indel
i
n
merge-recurs
i
ve: mark rena
m
e/delete
c
onflict as unmerged
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-25
Junio C Hamano
GIT 1
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-24
Junio
C Hamano
M
e
rge br
a
nch 'js/reba
s
e-i-p'
commit
|
commitdiff
|
tree
2008-12-24
J
o
hannes Schindeli
n
re
b
a
se -
i
-p:
leav
e
a -
-
cc patch when a merg
e
could
.
.
.
commit
|
commitdiff
|
tree
2008-12-23
Miklos
Vajna
t9129: s
k
ip the las
t
three
t
e
sts if
U
T
F
-8 local
e
i
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-22
Junio C Hamano
GIT 1
.
6
.
1-rc4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-22
Richard Har
t
mann
A
l
ways
show which dire
c
tory
i
s not a
git repository
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-22
R
i
chard
H
artmann
Make he
l
p en
t
ries
a
lphabetical
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-22
Juni
o
C Hamano
Merge
b
r
anc
h
'maint'
commit
|
commitdiff
|
tree
2008-12-22
Bo
y
d S
t
ephen Smith Jr
git-reve
r
t documentation: r
e
fer to new
HOWTO on
r
everting
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-22
Rob
i
n Ro
s
e
nberg
git-re
v
ert:
record t
h
e parent a
g
ai
n
st whi
c
h a revert
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-22
J
u
nio C
H
am
a
no
Me
r
g
e
git:/
/
git
.
kernel
.
org/pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2008-12-21
M
a
r
k
us Heid
e
lberg
doc/git-fsck: change the way for getting heads' SHA1s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-21
Mar
k
us Heidelberg
Do
c
umentation/
g
it-show-branch: work arou
n
d
"single
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-21
Junio C Hamano
sen
d
-
e
mail: fu
t
u
rep
r
oof
split_addrs() sub
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-21
Junio C Hamano
Make sur
e
lockfil
e
s ar
e
un
l
ocked when dyin
g
on SIGPIPE
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-21
René Sc
h
ar
f
e
fast-import
.
c: stricter str
t
oul check,
s
ilenc
e
c
ompiler
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-21
René Scharfe
c
o
nnect
.
c: stri
c
t
er port valida
t
io
n
,
si
l
e
n
c
e
compiler
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-21
Nanako Shiraishi
Add a documen
t
at on
h
ow
t
o
revert a faulty
mer
g
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-21
K
irill A
.
K
o
rinskiy
Rem
o
ve t
h
e require
m
ent opaq
u
eloc
k
toke
n
uri scheme
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-21
M
ar
c
el M
.
Cary
git-sh-setup: Fix scripts
whose PWD i
s
a
s
ymlink into
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-21
Jo
h
a
n
nes Sixt
rebase -i -p
:
Fix --con
t
inue af
t
er a merge could not
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-21
Johannes Sixt
Sh
o
w a
f
a
i
lure o
f
rebase -p if the
merg
e
had a conflict
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Markus Heidelberg
D
o
c
umen
t
ation: fix typos, gram
m
ar,
a
sc
i
i
doc syntax
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Junio C Hamano
Merge branc
h
'maint' to
s
ync with GIT 1
.
6
.
0
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Junio C
H
amano
GIT 1
.
6
.
0
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Junio C H
a
mano
fast-import: m
a
ke tagg
e
r
i
nformation option
a
l
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
J
oh
a
nnes Schindelin
fast-export: deal
with tag objects that do not have
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Miklos Vajna
SubmittingPat
c
h
e
s: mention
the usage of real name in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
David Aguilar
git-mergetool: properly
h
andle "git
m
e
r
get
o
ol
-
- filen
a
me"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
W
u
Fengguang
git-send-
e
mail: h
a
nd
l
e ema
i
l ad
d
r
ess
w
ith
quot
e
d com
m
a
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Markus H
e
i
d
elberg
Docume
n
tati
o
n: fix typos, grammar, asciidoc syntax
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-19
Ma
r
ku
s
H
e
i
d
elb
e
r
g
Documentation: sync
e
xample
o
utput with git output
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-18
René Scharf
e
Fix
t
ype-mismat
c
h c
o
mpiler
warning f
r
om d
i
ff_populate_
f
i
l
espec()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-18
Michael J Gruber
test
o
ver
l
apping ignor
e
pat
t
e
rns
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-18
J
unio C H
a
ma
n
o
Merge branch
'
l
t
/
r
eadlink'
commit
|
commitdiff
|
tree
2008-12-18
A
rjen
Laarhoven
Enable
t
h
reade
d
delt
a
sea
r
c
h
o
n
Mac OS X/Darwin
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-18
Nan
a
ko S
h
iraishi
Clarify docume
n
t
a
tion o
f
"
g
i
t checkout <tree-ish> paths
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-18
Junio C
Hamano
Merge git:/
/
repo
.
or
.
cz/g
i
t-gui
commit
|
commitdiff
|
tree
2008-12-17
Mi
k
los Vajn
a
git
h
ooks do
c
ument
a
tion: add a
n
ote about the
+x m
o
de
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
J
u
ni
o
C Hamano
c
o
mbine-diff
.
c: use s
t
rbu
f
_readlin
k
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Jun
i
o
C
Hamano
builtin-
b
lame
.
c:
u
se
str
b
uf
_
readlink
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Junio C
H
amano
m
ake
_
absolute_path(): check bounds
when seeing an overlong
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Linus Torvalds
Make
'pre
p
are_temp_fil
e
()' ignore st_size for
s
ymlinks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Lin
u
s Tor
v
alds
Make 'diff_po
p
ulate_filespe
c
()' use the n
e
w
'strbuf_read
l
ink
(
)'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
L
i
nus Torv
a
lds
Make
'
index_path()'
use
'
strb
u
f_
r
e
adl
i
nk(
)
'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Linus Torva
l
ds
Make 'ce_compar
e
_link()' use the new 'strbuf_readlin
k
()'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Lin
u
s
Torvalds
Add
g
e
neric
'str
b
uf_
r
eadlink()' helper function
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Ma
r
kus Heid
e
lberg
doc/git-r
e
set: add reference to git
-
st
a
sh
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
M
a
r
kus Heidelberg
Document
a
t
i
on:
f
i
x
descr
i
ption
f
or enabl
i
ng hooks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Miklo
s
Vajna
git-daemon d
o
c
umentation: use
{tilde}
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Junio C
Hamano
gi
t
web: d
o
not run
"git di
f
f" that i
s
Porcel
a
in
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Junio C Ham
a
n
o
GIT 1
.
5
.
6
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
J
unio C Hamano
G
I
T
1
.
5
.
5
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
J
unio
C Hamano
GI
T
1
.
5
.
4
.
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
J
u
nio C H
a
mano
gitw
e
b: do not run
"git diff" that is P
o
rcela
i
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-16
Le
e
Marlow
bash comple
t
ion:
Sy
n
c config variables with their man
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-16
Lee Marlow
bash completi
o
n: S
o
rt config completion vari
a
b
l
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-16
J
u
nio C Hamano
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2008-12-16
Joha
n
ne
s
Schindelin
fa
s
t-import:
close pack before unlin
k
ing
i
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-15
Juni
o
C Hamano
pag
e
r: do n
o
t dup2 stde
r
r if it is already r
e
directed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-15
Junio C Hamano
git-show: do not segfa
u
l
t
when
s
howing a bad t
a
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-15
J
o
hannes Sc
h
indelin
Get r
i
d of
t
he
last r
e
mn
a
nts of GIT_
C
ONF
I
G_LOCAL
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-15
Alexan
d
e
r Gavr
i
lov
Docume
n
tat
i
on: Describ
e
git-gui
Too
l
s menu
configur
a
t
i
o
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-15
YONETAN
I
To
m
o
kazu
git-fast-import
p
ossibl
e
memory c
o
rru
p
ti
o
n
problem
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-13
Markus Heidelbe
r
g
builtin
-
com
m
it: remov
e
unused
m
e
s
sage variable
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-13
Junio C Hamano
Merge
branch 'maint'
commit
|
commitdiff
|
tree
2008-12-13
Brando
n
Casey
git-branch: display
s
ha
1
on branch dele
t
i
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-13
Jim M
e
yer
i
ng
git-config
.
t
x
t
: fix a typo
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-11
Jun
i
o C H
a
mano
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2008-12-11
L
inus Torvalds
fsck: reduce stack foo
t
print
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-11
Jeff King
rebase: improve err
o
r
mes
s
a
ges about
dir
t
y state
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-11
N
i
co
l
as Pi
t
re
make su
r
e p
a
ck
s
to be r
e
p
l
ac
e
d are close
d
b
eforehand
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
Alexander
Potashev
Fix typo in co
m
ment
i
n built
i
n-
a
d
d
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
Junio C Ham
a
no
Fix t4031
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
J
unio C
H
ama
n
o
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2008-12-10
Jeff King
di
f
f
:
respect text
c
onv in rewrite diffs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
Jeff King
diff: f
i
x handling of
bina
r
y rewrite diff
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
A
l
exander Pot
a
shev
Fix t
y
pos in
d
o
cum
e
n
tation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
Tor Arv
i
d L
u
nd
git-
p
4
:
F
i
x r
e
gression in p4Where m
e
th
o
d
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
Ralf Wi
l
d
e
nhues
Impr
o
ve language in git-
m
e
rge
.
txt a
n
d related docs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
Junio C Hamano
work around Python warnings from AsciiDoc
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-09
Alexey Borzenko
v
Define
linkgit macr
o
i
n
[
macr
o
s] sectio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-09
D
eskin Mille
r
git-
s
vn
:
Make
f
ollowing parents atomic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
Jakub Nare
b
s
k
i
gitweb: Fi
x
b
u
g in insert_file()
s
u
brouti
n
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
Je
f
f King
diff
:
a
l
low turning on
text
c
onv explicitly
for
plumbing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
Jeff
K
in
g
reor
d
er
ALLOW_TEXTCONV opt
i
on setting
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
Ju
n
io C Hamano
re
a
d-cac
h
e
.
c: typof
i
x i
n
comment
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
J
u
nio
C Hamano
builtin-chec
k
out
.
c: ch
e
ck error ret
u
rn from read_cache()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
Ju
n
io C Ha
m
ano
P
o
in
t
"stale" 1
.
6
.
0
.
5
documentat
i
on from
t
he main
g
it
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
Ju
n
io
C
Hamano
Revert "g
i
t
-stash:
use git re
v
-parse -
q
"
commit
|
commitdiff
|
tree
2008-12-07
Juni
o
C Ham
a
no
Update draft release
n
otes for 1
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-07
Junio C Haman
o
Merge branch '
m
a
i
nt'
commit
|
commitdiff
|
tree
2008-12-07
Ju
n
io C
H
a
mano
GI
T
1
.
6
.
0
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-07
Ma
t
t
McCutchen
"
git diff <tree>{3,}": do not reverse order of arguments
commit
|
commitdiff
|
tree
2008-12-07
Jeff K
i
ng
tag: dele
t
e TAG_E
D
ITMSG only on successful
tag
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-07
Jakub Narebski
gitweb: M
a
ke pr
o
ject specific
override for 'grep' featu
r
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-07
M
ikl
o
s
Vajna
http
.
c
:
u
se 'git_c
o
nfig
_
string' to get 'curl_http_proxy'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-07
Thomas Rast
f
e
tch-p
a
ck
:
Avoid memcpy()
w
ith src==dst
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-06
Junio C Hamano
Update draf
t
release notes to 1
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next