repo.or.cz
/
git
/
trast.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Keep rename/rename conflicts of intermediate merges while doing recursive merge
2007-03-31
A
lex
Rie
s
en
Keep
renam
e
/
renam
e
conflict
s
o
f intermediate merge
s
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-31
Julian Phillips
contrib/workd
i
r: add a simple script to create a working
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-31
A
n
d
y Parkins
Reimplement emailin
g
part of ho
o
k
s--update in con
t
r
i
b
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-31
E
r
ic W
o
n
g
git-svn
:
a
voi
d
respewing si
m
il
a
r error messages fo
r
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-31
T
heodore Ts'o
Rename war
n
() to warni
n
g() to fi
x
symbol conflict
s
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-31
Don Zickus
g
it-mailinfo
f
ixes for patch mungi
n
g
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-31
Jak
u
b
Nar
e
bski
git
w
e
b:
S
uppor
t
comparing blob
s
(fil
e
s) with different
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
J
u
nio C Hamano
Do no
t
bo
t
he
r
do
c
umenting
f
etc
h
-
-tool
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Ju
n
i
o C Hamano
Update draft
release notes f
o
r 1
.
5
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Juni
o
C Hamano
M
erge branch
'maint'
commit
|
commitdiff
|
tree
2007-03-30
Francis Daly
git-qu
i
ltimpor
t
/bi
n
/sh-is
m
f
i
x
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Christian Coud
e
r
Bisect: I
m
pro
v
e
error messag
e
in "bisect_ne
x
t
_ch
e
ck"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Jun
i
o C Hamano
Mer
g
e
branch
'master' o
f
git://repo
.
or
.
cz/git/merg
e
too
l
.
git
commit
|
commitdiff
|
tree
2007-03-29
H
.
P
ete
r
A
n
vin
git-upload-pack: make sure we close un
u
sed pipe ends
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-29
G
e
rrit P
a
pe
Doc
u
mentation
/
git-rev-pa
r
se
.
txt:
f
ix example i
n
SPE
C
IFYI
N
G
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-29
Gerrit Pape
Documentat
i
on/
g
it-svn
i
mport
.
txt: fix typo
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
G
I
T 1
.
5
.
1-rc3
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hama
n
o
Update main git
.
ht
m
l page to p
o
int at 1
.
5
.
0
.
6 documentation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Junio C Haman
o
Merge branch 'maint' to sync
h
ronize wi
t
h
1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
GIT 1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Jeff King
c
o
m
m
it:
fix pre
t
ty-printi
n
g
of
messages
w
i
t
h "\nenco
d
ing "
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
J
ohannes Schind
e
lin
t4118
:
be nice to non-GN
U
sed
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Jeff King
t/
t
6006: add tes
t
s fo
r
a sligh
t
ly more complex commit
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Jeff King
Fix "--pretty=form
a
t
:
" encoding item
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Junio C
H
amano
Fix "--prett
y
=
f
or
m
at
:
"
for parent
r
e
lated
i
t
e
ms
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Gerrit Pape
http-fetch
:
remove path_len from s
t
r
u
ct
a
lt_base, it
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Gerrit P
a
pe
http-f
e
tch: do
n
't u
s
e d
o
uble-s
l
ash as direct
o
ry separator
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
git-commit: "read-tree -m HEA
D
" is
not the right w
a
y
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Jeff King
Add some basic t
e
sts of rev-list --pretty=format
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
H
.
Peter A
n
v
in
git
-
upload-pack: make
sure we c
l
ose unused pipe end
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Jeff King
-
-
pretty=
f
o
r
ma
t
: fix broken %ct and %at interpolation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
J
a
mes Bowe
s
use
x
r
e
allo
c
in help
.
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
James Bowe
s
read-tree: use xcal
l
oc
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
Linus Torvalds
Fix "getaddrinfo()" buglet
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
Gerrit P
a
pe
Makefile:
remove test-chmt
i
me
p
r
ogram in target cle
a
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
Jakub N
a
r
e
bski
gitweb: Cleanup and uniquify die_error ca
l
l
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
J
u
nio C H
a
m
a
n
o
sha1_file
.
c (wr
i
te_sha1_file
)
: Detect clos
e
f
ailu
r
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
Alexan
d
re Jullia
r
d
git
.
el: Display some information abo
u
t the HEAD comm
i
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
Junio C
H
amano
Docu
m
ent git-log
-
-first-pare
n
t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
Chr
i
stian Couder
Bisect:
a
dd
c
hecks at the
begi
n
ning
of "git
b
i
sect
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
Jim Meyer
i
ng
sha1_file
.
c (writ
e
_sha1_from_fd): Detect clo
s
e failure
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
Jeff King
git-rm
:
don'
t
remove newl
y
added file wit
h
ou
t
-
f
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-26
Chris
t
i
a
n Couder
Bisect: Use "git-show-ref --ve
r
ify" when reseting
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-26
J
akub Narebski
g
i
tw
e
b: Add exampl
e
of
c
onfig
file and
h
o
w to
gene
r
ate
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-26
J
unio C Hama
n
o
GIT 1
.
5
.
1-rc2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-26
Eric W
o
ng
g
i
t
-svn: fix rel_p
a
th() wh
e
n not connected to the r
e
pository
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-26
James Bowes
u
s
e xmallo
c
in git
.
c and
h
e
lp
.
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-26
Junio C
Haman
o
Merge branch 'jc/fpl'
commit
|
commitdiff
|
tree
2007-03-26
Jun
i
o C
H
amano
Update README
to poin
t
at a
few
key p
e
riodical messages
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-25
Jun
i
o C Hamano
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2007-03-25
Junio
C
Hamano
Merge branch '
m
aint' of git://
l
inux-nf
s
.
org/~bfields
.
.
.
commit
|
commitdiff
|
tree
2007-03-25
Junio C Haman
o
Merge branch 'j
s
/
r
emote-show-push'
commit
|
commitdiff
|
tree
2007-03-25
Junio C Hamano
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2007-03-25
Alex Riesen
Use diff* with --exit-code in git-am, git-rebase a
n
d
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-25
Alex Rie
s
en
Document --quiet opti
o
n
to git-diff
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-25
Nicola
s
Pitre
write_sha1_from_fd()
should
make new obj
e
cts read-only
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-25
Nicolas P
i
tre
make it more obvious that temporary f
i
les are temporary
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-25
And
y
Parkins
update-hook: remove e-mail sending hook
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-25
Jakub
N
arebsk
i
gitweb: Ad
d
some install
a
tio
n
notes in
g
itweb/
I
NSTALL
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-25
Jakub Narebski
gitweb
:
Fix n
o
t mar
k
ing si
g
noff lin
e
s
in "log" view
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-25
Jakub N
a
rebski
g
i
t
web: Don't es
c
ape attributes in CGI
.
pm HTML me
t
hods
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-25
Li Y
a
n
g
gitwe
b
: Change to
use explicitly function cal
l
cgi
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-24
J
u
nio C Hamano
git-am docume
n
tation: describe what is taken
f
r
om where
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-24
Johann
e
s Sc
h
indelin
git-reve
r
t: Re
v
ert revert messag
e
to old behavio
u
r
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-24
Junio
C
Hamano
M
e
r
ge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-03-24
C
h
r
i
stia
n
Couder
Docum
e
ntation: bisect:
m
a
ke a comment fit better
i
n
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-24
Chri
s
tian Couder
Docu
m
ent
a
tion:
b
i
sect:
add s
o
me titles to some paragraphs
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-24
Christian Couder
Documenta
t
ion:
b
i
sect: re
f
ormat m
o
re para
g
raph
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-24
Ch
r
i
s
t
ia
n
Cou
d
e
r
Documen
t
ation:
bisect: reword
o
ne
p
aragraph
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-24
Christian Couder
Documentation: bisect: r
e
form
a
t
some paragraphs
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-24
Junio C Ham
a
no
Fix path-li
m
ited "rev-list
--bisect" termination conditi
o
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
Ja
k
ub Na
r
ebski
gitweb: Fix "next" l
i
nk i
n
commit v
i
ew
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
Ju
n
io C Hama
n
o
g
it-
b
is
e
ct
.
sh: properly dq $GIT_D
I
R
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
Junio C Hamano
git-bise
c
t
:
t
y
pof
i
x
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
J
unio C
Ham
a
n
o
checkout
:
report where t
h
e new HEA
D
is upon de
t
achi
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
Chris
t
ian Couder
Bisect
:
implement "
g
it bise
c
t run <cmd>
.
.
.
" to autom
a
tica
l
ly
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
Uwe Kle
i
ne-König
Bise
c
t: convert
r
evs given to good and ba
d
to com
m
its
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
Johannes
S
chindeli
n
t4118: be nice
t
o no
n
-G
N
U se
d
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
Ju
n
io C
H
amano
git-apply: Do not free the
wrong bu
f
fer when
w
e conver
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Junio C
H
aman
o
Merge git://gi
t
2
.
kernel
.
org/pu
b
/s
c
m/gitk/
g
it
k
commit
|
commitdiff
|
tree
2007-03-22
Junio C Ham
a
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-03-22
P
e
te
r
Er
i
ksen
Documentat
i
on/
p
ack-form
a
t
.
t
xt: Clear up
de
s
cri
p
tion
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Nicolas Pitre
update HEAD reflog wh
e
n br
a
nch pointed to
by HEAD is
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Andy Parkins
up
d
ate-hook:
abort
e
ar
l
y i
f
the
project descr
i
ption
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Michael
S
.
T
sirkin
git-mer
g
e
: Put FETC
H
_HEAD data in me
r
g
e
c
o
mmit
m
essage
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Junio C Hamano
gi
t
-rebase
:
make
'
reb
a
se
H
EAD branch' work as
expected
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Jun
i
o C Ha
m
ano
tree_entry_
i
ntere
s
ting():
a
ll
o
w it to say
"everything
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Junio C Ham
a
no
t
r
ee-diff: a
v
oid strncmp()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Junio
C
Hamano
Teac
h
t
r
ee_
e
ntry_interesting() that th
e
t
r
ee en
t
ries
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-21
L
i
nu
s
To
r
valds
Swi
t
ch ov
e
r
t
ree descriptors to cont
a
in
a
pre-parsed
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-21
Linus Torvalds
Initialize tre
e
descriptors with a helpe
r
fun
c
tion
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-21
Linus
T
orvalds
R
em
o
ve "pathlen" from "struct name_entr
y
"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-21
Mi
c
h
ael S
.
Tsirkin
fix t
y
po
i
n git-am manpage
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-21
Ju
n
io C
Hamano
b
lame: cmp_suspect is not "cmp
"
a
n
ym
o
re
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-21
Nicolas Pitre
m
i
nor git-prune optimi
z
ati
o
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-21
Nicol
a
s
Pitre
improve checkout
m
essag
e
w
hen
asking for
s
ame branch
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-21
Linus Torvalds
Be more careful about zlib
ret
u
r
n
v
alues
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-21
Linus Torvalds
Don'
t
ever r
e
turn
corrupt obje
c
ts
f
r
o
m
"
p
a
rse
_
object(
)
"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-21
N
icol
a
s Pitre
i
n
dex-p
a
ck: more validation
c
hec
k
s a
n
d cleanups
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-21
Nicolas
P
itre
index-pack: use hash_sha1_file()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next