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
Fix twoway_merge that passed d/f conflict marker to merged_entry().
2007-04-04
Ju
n
io C Hamano
Fix
twoway_merge that passed d/f conflict marker
t
o
.
.
.
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io C H
a
man
o
Fix
r
ead-tree --prefix=dir/
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
H
a
mano
unpack-trees: g
e
t r
i
d of *ind
p
os
param
e
ter
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o C Hama
n
o
unpack_trees
.
c:
p
as
s
unpack_trees_options structu
r
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C
H
amano
add_c
a
c
h
e_entry(
)
:
r
emoval of file
f
oo does not conflict
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
J
unio
C Hamano
Merge branch
'jc/b
i
s
e
c
t
'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hama
n
o
Me
r
ge
b
ranc
h
'fl/d
o
c'
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
i
o C Haman
o
Mer
g
e branch 'post1
.
5
.
1/blame
.
el
'
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io C Hamano
Mer
g
e branch '
p
ost1
.
5
.
1/tcl
t
k'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Merge
b
ranch '
p
o
s
t1
.
5
.
1/p4'
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio C Hamano
Merge
b
r
a
n
c
h
'lt
/
dir
w
a
lk'
commit
|
commitdiff
|
tree
2007-04-04
J
u
n
i
o C Hamano
GIT 1
.
5
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Merge 1
.
5
.
0
.
7 in
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o C
Haman
o
GIT 1
.
5
.
0
.
7
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
J
a
kub N
a
rebski
Documentation: A f
e
w mi
n
or fixes to Git User'
s
Man
u
a
l
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Nicolas
P
i
t
re
Plug me
m
ory leak in
index-pack collisi
o
n checking codep
a
th
.
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
r
erere shou
l
d no
t
repea
t
t
h
e
e
arlier hunks in la
t
e
r
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-02
J
u
nio C
H
am
a
no
Hopefully f
i
n
al updat
e
to
t
h
e draft Re
l
ea
s
e
Notes,
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-01
Ju
n
io C Hamano
Option
a
l Tck/Tk: igno
r
e generated files
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-01
Eygene Ryabin
k
in
E
l
iminate c
h
e
c
ks o
f
us
e
r-speci
f
i
e
d T
c
l/Tk inter
p
reter
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-01
Ey
g
ene Ryabinkin
R
e
write Tcl/Tk inter
p
reter path for the GUI t
o
ols
.
commit
|
commitdiff
|
tree
2007-04-01
Eygene Ryabi
n
kin
Add --with-tcltk and
--witho
u
t-tcltk to
c
onfigure
.
commit
|
commitdiff
|
tree
2007-04-01
Eygene Ryabinkin
NO_TCLTK
commit
|
commitdiff
|
tree
2007-04-01
Eygene Ryabinki
n
Added c
o
rre
c
t Python path to the RPM specfile
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-01
Brian Gernhardt
Remove unused W
I
T
H_OWN_SUBPRO
C
ESS_
P
Y from RPM
spe
c
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-01
E
y
gene Ryabinkin
Added
git-p4 packa
g
e to the list
o
f
g
i
t RPMs
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-01
Eygene Ryabinkin
Add the W
I
TH
_
P4IMPORT
k
nob to
the Mak
e
fi
l
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-01
X
a
vier Maillard
gi
t
-blame
.
el: pick a set of rand
o
m colors
for e
a
ch
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-01
Xavie
r
Maillard
g
it-blame
.
el: separate git-b
l
ame
-
mode
t
o
e
ase maintenance
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-01
Linus Torvalds
Optimize directo
r
y li
s
ting with
p
athspe
c
limit
e
r
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-31
Frank
L
ichtenheld
cvsse
r
ver: Don't lie about binary mode
i
n asciidoc
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-31
Eric Wong
git
-
svn:
f
ail on rebas
e
if
we are unab
l
e to find
a
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-31
Alex Riesen
Keep rename/re
n
ame conflicts of int
e
r
mediate merges
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-31
Jul
i
a
n
Phillips
con
t
rib/wo
r
kdir: add a simple
s
c
ript to create a working
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-31
Andy Parkins
R
e
impleme
n
t emailing part of
h
ooks
-
-
update
in cont
r
ib
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-31
Eric Wong
git-svn: avoid respewing
simil
a
r er
r
o
r messages for
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-31
Theodore
Ts'o
Rename warn() to warni
n
g() to
fix symb
o
l
c
onf
l
ic
t
s
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-31
Don Zickus
git
-
mailinfo
f
ixes fo
r
patch mu
n
ging
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-31
Jak
u
b Narebski
g
i
tw
e
b: Support co
m
paring blo
b
s (files) wi
t
h different
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
J
unio C Ham
a
no
D
o
not both
e
r doc
u
me
n
ting f
e
tc
h
-
-
tool
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
Junio C Hamano
Update draft re
l
ease notes for 1
.
5
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
J
u
nio C Hamano
Merg
e
branch 'maint
'
commit
|
commitdiff
|
tree
2007-03-30
Francis
D
aly
git-quiltimport
/
b
in
/
sh-ism fix
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
Christian Couder
Bisect: Improve error message
i
n
"
b
isect_next_chec
k
"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
Junio C Hamano
Merge branc
h
'mast
e
r' of git:
/
/re
p
o
.
or
.
cz/git/mer
g
etool
.
git
commit
|
commitdiff
|
tree
2007-03-29
H
.
Peter Anvin
git-upload-pac
k
: make sure we close unused pipe ends
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-29
G
e
r
r
it Pape
Document
a
t
ion/git-rev-parse
.
txt: fi
x
e
x
ample in SPECIFYIN
G
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-29
G
e
r
r
it
P
ape
Doc
u
mentation
/
git-sv
n
impor
t
.
txt
:
fix t
y
po
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Jun
i
o C Hamano
Doc
u
m
e
n
t
ation: unb
r
eak user-manual
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Frank Licht
e
nheld
Documentation: A
d
d version informa
t
ion to ma
n
pag
e
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Fran
k
Lichtenheld
Documentation: Replace
@@GIT_
V
ERSION@@ in docum
e
ntation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
J
unio C Hamano
GIT 1
.
5
.
1-rc3
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
Update main git
.
html
p
age to
p
oint at
1
.
5
.
0
.
6 documenta
t
ion
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Junio
C
H
a
mano
Merg
e
branch 'maint' to synchronize with 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
Kin
g
commit: f
i
x pretty-p
r
inting
of me
s
sages with "\
n
encoding "
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Joh
a
n
n
e
s
Schi
n
delin
t4118: be nice
t
o no
n
-GN
U
sed
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
J
e
ff King
t/t
6
0
0
6:
a
dd tests for a slightly more compl
e
x commit
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Jeff King
Fix "--pretty=
f
ormat:" encoding i
t
em
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
Fix "--pretty=form
a
t:" for
p
ar
e
nt related items
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
G
e
rrit
P
ape
http
-
fetch: remove path_le
n
f
r
om struct
alt_base, it
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Gerrit Pape
http-fetch: don't use double-slash as dir
e
c
t
or
y
separator
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Jun
i
o C Hamano
git-
c
ommi
t
: "read-
t
r
e
e -m HEAD" is not the r
i
ght way
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Jeff Ki
n
g
Add some basic tests of rev-list --pretty=fo
r
mat
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
H
.
Peter Anvin
git-u
p
load-pack
:
make su
r
e we close unused p
i
pe ends
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Jeff King
--pr
e
t
t
y=
f
orma
t
: fix broken %ct and %at interpolation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-27
James
B
owes
use xrealloc in help
.
c
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-27
James
Bowes
read-
t
ree: use xcalloc
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-27
Linus Torvalds
Fix "
g
eta
d
drinfo()" bu
g
l
e
t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-27
G
e
rrit Pape
Makefi
l
e: remo
v
e
t
e
st
-
chmt
i
me program in targ
e
t clean
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-27
Jakub Nare
b
s
ki
gitweb: Cleanup
and u
n
iquif
y
die_e
r
ror call
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-27
Ju
n
io C Hamano
sha
1
_file
.
c
(write
_
sha1_file
)
: Detect close failu
r
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-27
Ale
x
andre
J
ulliard
git
.
el: Displ
a
y some inf
o
rmation abo
u
t the
HEAD commit
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-27
Junio C Hamano
Document git-log
--fir
s
t-parent
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-27
C
hristian Coud
e
r
Bi
s
ect: add checks at
t
h
e
beg
i
nning of "git bisect
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-27
J
i
m
M
ey
e
ring
sh
a
1_fil
e
.
c
(
wr
i
te_s
h
a1_from_
f
d): Detect c
l
o
s
e
f
ailure
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-27
Jeff Kin
g
git-rm: do
n
't remove
newly added file
without -f
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-26
Christian Couder
Bisect: Use "gi
t
-show-ref --veri
f
y" when reseti
n
g
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-26
J
a
kub Narebsk
i
gitweb: Add example of config file and
how to generate
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-26
Junio
C Hamano
GIT 1
.
5
.
1-rc2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-26
Eric Wong
git-svn: fix rel_path() whe
n
no
t
connected to the repositor
y
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-26
J
a
mes
B
owes
use xmall
o
c in
git
.
c and help
.
c
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-26
J
u
n
io C Hamano
M
e
rge branch
'jc/fpl'
commit
|
commitdiff
|
tree
2007-03-26
Ju
n
io C Hamano
U
pdate README to point at
a
f
e
w key peri
o
dical messages
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-25
J
u
nio C Hamano
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2007-03-25
Jun
i
o C H
a
mano
Merge branch 'maint' of git://l
i
nux-nf
s
.
org/~bfi
e
lds
.
.
.
commit
|
commitdiff
|
tree
2007-03-25
Junio C Hamano
Merge branch 'js/remote-show-p
u
sh'
commit
|
commitdiff
|
tree
2007-03-25
J
u
nio C Hama
n
o
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-03-25
Alex R
i
esen
Use di
f
f* with
-
-
exit-code in git
-
am,
g
it-rebase and
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-25
Alex Riesen
Document --qu
i
et option to git-diff
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-25
Nicolas Pitre
writ
e
_sh
a
1_from
_
fd()
s
h
ould make
new objects read-only
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-25
N
i
col
a
s Pitre
m
a
ke it m
o
re
obvious that temporar
y
files
a
re temporary
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-25
Andy Parkins
update-hook: remo
v
e e-mai
l
sendi
n
g
hook
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-25
Jakub
Narebski
gitw
e
b
: Add some installation notes
i
n
gitweb/INSTALL
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-25
Jakub Narebsk
i
gitweb: Fix
n
o
t
marking signoff lines in "log" view
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-25
Jakub Narebs
k
i
gitweb: Don't es
c
ape
attributes in
C
GI
.
pm HTML methods
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-25
Li Yang
gitweb:
Ch
a
nge to use ex
p
licitly function call cgi
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-24
Junio C Ham
a
no
git-am
documentation: describe w
h
at is taken
from where
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-24
Johannes Schind
e
lin
git-revert: Revert revert message to old beh
a
viou
r
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-24
Juni
o
C Hamano
make
t
h
e
p
revious op
t
imization work also on
p
ath
-
limi
t
ed
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next