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
pull --rebase: Avoid spurious conflicts and reapplying unnecessary patches
2010-08-13
E
li
j
a
h Newren
pu
l
l --rebase: Av
o
id spurious conflicts and reapplying
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-13
Elijah New
r
en
t5
5
20-pul
l
: A
d
d
t
e
stcases
s
h
o
wing spurious
c
on
f
li
c
ts
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-12
Jun
i
o
C
H
amano
Git 1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-12
Junio
C
H
ama
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-02-12
Ju
n
i
o C Hamano
F
i
x typo in 1
.
6
.
6
.
2
release notes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-12
J
u
nio C Hama
n
o
R
e
-fix check-ref-form
a
t
docu
m
entation mar
k
-up
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-12
Junio C Hamano
archive
do
c
umentation: at
t
r
ibutes ar
e
taken
f
rom t
h
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-12
Mi
c
hael J
G
ruber
Docum
e
ntatio
n
: minor fixes
to RelNote
s
-1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-12
SZEDER
Gábor
bash: support 'git am's n
e
w
'--continue' op
t
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-12
Juni
o
C
Hamano
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2010-02-12
Jacob Helwig
f
ilter-branch: Fix erro
r
message for --prune-empty
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-12
J
e
f
f
King
am:
s
witch --resolved to --
c
ontinue
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-10
Juni
o
C Hamano
Update dr
a
ft r
e
leas
e
n
o
tes to 1
.
7
.
0 one mor
e
time
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-10
Junio C Ha
m
ano
Sy
n
c with 1
.
6
.
6
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-10
Junio C Hamano
Git 1
.
6
.
6
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-10
Ju
n
io C H
a
m
a
no
M
e
rge
b
ran
c
h 'maint-1
.
6
.
5'
into
m
a
in
t
commit
|
commitdiff
|
tree
2010-02-10
Juni
o
C Haman
o
t8003: check exit code of comm
a
nd and er
r
o
r m
e
s
s
age
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-10
Junio C Hama
n
o
Merge branch 's
p
/
m
aint-fast-import-l
a
rge
-
blo
b
' i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2010-02-10
Junio C Hamano
Merge branch 'gp/maint-cvsserver'
i
n
t
o maint
commit
|
commitdiff
|
tree
2010-02-10
Juni
o
C H
a
man
o
Me
r
ge b
r
a
nch 'jc/maint
-
ref
l
og-bad-tim
e
stamp' into maint
commit
|
commitdiff
|
tree
2010-02-10
Junio C H
a
m
ano
M
e
r
ge branch 'il/ma
i
n
t-xmallocz' into ma
i
nt
commit
|
commitdiff
|
tree
2010-02-10
Ju
n
io C Hamano
Me
r
ge branch
'jh/
m
a
i
n
t
-
config-file-prefix
'
into maint
commit
|
commitdiff
|
tree
2010-02-10
Junio C H
a
man
o
Merge branch 'nd/inclu
d
e-termi
o
s
-
for-osol' into
maint
commit
|
commitdiff
|
tree
2010-02-10
Jun
i
o C Ham
a
no
Merge branch 'jc
/
ma
i
nt-
1
.
6
.
1
-
checkout-m-custom-merg
e
.
.
.
commit
|
commitdiff
|
tree
2010-02-10
Junio C Haman
o
Merge branch 'rs/mai
n
t-archive-match-pathspec'
into
.
.
.
commit
|
commitdiff
|
tree
2010-02-10
J
u
nio C H
a
m
a
n
o
check-
r
e
f
-
f
o
r
m
at documen
t
ation: fix enumerati
o
n mark-up
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-10
Tho
m
a
s Rast
Do
c
ume
n
tation: quote braces in {upstream} notation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-09
Brian Gern
h
ardt
t
3
9
0
2: Protect against O
S
X normalization
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-09
Junio C
Hamano
M
erge
b
r
a
n
ch 'mai
n
t'
commit
|
commitdiff
|
tree
2010-02-09
Junio C
Ham
a
n
o
Me
r
ge branch
'
maint-1
.
6
.
5
' into maint
commit
|
commitdiff
|
tree
2010-02-09
J
ay Soffian
blame: prev
e
nt a
segv when -L g
i
ven st
a
rt > EOF
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-09
Ju
n
i
o
C
H
amano
Merge branch 'j
c
/main
t
-push-doc-st
a
tus
'
into maint
commit
|
commitdiff
|
tree
2010-02-09
Junio C
Hama
n
o
git-
p
u
sh: document all the st
a
tus fla
g
s u
s
ed in the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-08
Junio C Hama
n
o
M
erge b
r
an
c
h 'jc/maint-imap-config-parse' into
m
aint
commit
|
commitdiff
|
tree
2010-02-08
J
u
nio C Hamano
Fix parsing of
i
m
a
p
.
prefo
r
matted
H
TML and
i
m
ap
.
sslverify
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-08
J
unio C Ham
a
no
Merge branch
'
j
c/maint-doc-git-add-examp
l
e' into ma
i
n
t
commit
|
commitdiff
|
tree
2010-02-08
Junio C
H
amano
git-add
d
ocumentation: Fix shell
q
uoti
n
g
e
xamp
l
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-08
N
icolas Pitre
Revert "pack
-
o
b
j
e
c
ts
:
fix pack gen
e
rat
i
on when using
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-07
J
unio C Hama
n
o
Merge
git://repo
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
2010-02-07
Junio
C
Hamano
M
erge b
r
anch '
m
aint
'
commit
|
commitdiff
|
tree
2010-02-07
René Scharfe
archive: simpli
f
y archive format g
u
essing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-06
J
e
f
f
King
Fix invalid read
i
n
q
uot
e
_c_style_counted
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-06
Jeff King
docs: fix f
i
lter-branch example for quote
d
paths
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-06
Br
i
an Gernhardt
t9501: Re-fix max load
t
e
st
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-06
Björn Gustav
s
son
bash: support t
h
e --autosquash option f
o
r reb
a
s
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-06
J
unio
C Hamano
Merge git://git
.
k
e
rnel
.
o
r
g/pub/
s
cm/gitk/gitk
commit
|
commitdiff
|
tree
2010-02-06
Brian
Ger
n
h
ardt
t950
1
: Skip testing load
i
f
we
ca
n
't detect it
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-06
Junio
C
H
a
m
an
o
Update draft relea
s
e
n
otes to 1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-06
Junio C Hamano
Merge
branch 'maint
'
commit
|
commitdiff
|
tree
2010-02-05
Wesley
J
.
Landa
k
er
U
p
date git
f
sck
-
-
f
ull
short de
s
c
ription to mentio
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-05
Junio
C
H
a
mano
Me
r
ge branch 'jc/maint-limit-
n
ote-output' int
o
main
t
commit
|
commitdiff
|
tree
2010-02-05
Junio C
H
amano
Revert 3081
6
237 and
7
e62265
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-04
J
unio C H
a
m
a
no
fas
t
-import: count
-
-max-p
a
ck-size in byt
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-04
Nicolas Pit
r
e
update git
-
repack d
o
cumentation wrt
r
epack
.
U
s
eDel
t
aBase
O
ffset
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-04
Mi
c
h
a
el
J
G
ruber
git-clean: f
i
x the descri
p
t
i
o
n of t
h
e default
beha
v
ior
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-04
Juni
o
C Hamano
fast-import
.
c:
Fix
big-file-thresh
o
l
d
par
s
ing bug
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-04
Nic
o
las Pi
t
re
make --max-pa
c
k
-si
z
e ar
g
um
e
n
t to 'git pa
c
k-object'
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-04
N
icolas
Pitre
pack-obj
e
cts: f
i
x pack genera
t
i
o
n when usi
n
g pack_size_
l
imit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-04
Nic
o
las Pitre
fix multiple
i
ssu
e
s w
i
th t5300
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-04
Joh
n
'Warth
o
g9'
.
.
.
gitwe
b
: Simplify (and f
i
x) chop_str
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-03
René
S
charfe
grep: simplify a
s
signment of -
>
f
i
xed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-03
Jun
i
o C Hamano
Merge branch 'ms/filter-branch-sub
m
o
d
ul
e
'
commit
|
commitdiff
|
tree
2010-02-03
J
unio
C
Hamano
Merge bra
n
ch 'jh/gitweb-cac
h
ing' (earl
y
pa
r
t
)
commit
|
commitdiff
|
tree
2010-02-03
Juni
o
C Hamano
Merge
branch 'bw/
n
o-pytho
n
-autoconf'
commit
|
commitdiff
|
tree
2010-02-03
J
unio C Ha
m
a
no
Me
r
g
e
bra
n
ch 'sp/fa
s
t-import
-
l
arge-blo
b
'
commit
|
commitdiff
|
tree
2010-02-02
Shaw
n
O
.
Pearce
Correct spelling of 'REUC' extensi
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-02
Jun
i
o C Hamano
build: make
c
ode "-Wpo
i
n
ter-arith" clean
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-01
B
e
n Walton
c
onfigure: Allow --without-
p
yth
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-01
B
e
n Walton
configur
e
: Allow
GIT_ARG_S
E
T_P
A
TH to handle --without
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-01
Junio
C
H
a
mano
Merge branch 's
p
/ma
i
nt-fast-import-larg
e
-blob' into
.
.
.
commit
|
commitdiff
|
tree
2010-02-01
Shawn O
.
Pearce
fast-i
m
p
o
r
t: Stream very large blobs directly to pack
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-01
Pa
l
-K
r
istian Engstad
git-p4: Fix sync er
r
ors due to
new server version
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-01
Jens
Lehman
n
Up
d
ate
s
for dirty submodules in release notes and
u
s
er
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-01
Junio C Ha
m
ano
Merge b
r
an
c
h 'sb/maint-
o
c
t
o
p
us' in
t
o maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-02-01
Junio C Ham
a
no
Merge branch 'bg/maint
-
ad
d
-all-
d
oc' i
n
to maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-31
Junio C Ham
a
no
Update draft release n
o
tes to 1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-31
J
unio C Haman
o
Merge
branc
h
'd
m
/make-threaded-s
i
mplify'
commit
|
commitdiff
|
tree
2010-01-31
Dan
McGee
Make
N
O_PTHREADS the
s
ole thread c
o
n
f
iguration va
r
iable
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-31
Jun
i
o
C Hamano
RPM
p
ackaging: use
%
gl
o
bal insi
d
e %{!?
.
.
.
}
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-31
Jeff King
mention new s
h
ell execution behavior in rel
e
a
s
e
notes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-31
Jens Lehma
n
n
Fix memory
l
eak in
submodule
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-31
R
alf Wildenhue
s
Fix t
y
pos in
technical do
c
u
m
e
ntation
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-30
J
ohn '
W
a
r
tho
g
9'
.
.
.
gitweb: Add opti
o
nal extra
pa
r
ameter to
d
ie_e
r
ror,
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-30
John 'Warthog9
'
.
.
.
gitweb: add a "s
t
ring" varian
t
o
f
print_sort_th
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-30
J
o
hn '
W
art
h
og9'
.
.
.
gi
t
w
e
b:
add a "st
r
ing" v
a
riant
of print_local_time
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-30
J
o
hn
'Warthog9'
.
.
.
gitw
e
b
: Check that $site_header et
c
.
are defined before
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-30
John 'Warthog9'
.
.
.
g
itweb
:
Makef
i
le
im
p
rovemen
t
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-30
John '
W
arthog9'
.
.
.
g
i
t
web:
Load che
c
ki
n
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-30
Ja
k
ub Narebski
gitwe
b
: Make runnin
g
t9
5
01 test
w
ith
'
--debug' reliable
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-30
Ju
n
io
C
H
amano
is_
s
u
b
module_
m
odif
i
ed(): fix
b
reak
a
ge with
e
x
terna
l
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-30
Junio C Haman
o
RPM pa
c
kaging: don't inc
l
ud
e
foreign-sc
m
-he
l
pe
r
bit
s
yet
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-30
Dan McG
e
e
gre
p
: F
i
x two memor
y
lea
k
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-30
Ma
r
kus Heid
e
lberg
rebase:
don't in
v
oke the pag
e
r
for
each commit s
u
mmary
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-30
Ju
n
i
o
C
H
amano
Upd
a
t
e draft rele
a
se notes to 1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-30
Junio C Ham
a
no
M
erge branch 'main
t
'
commit
|
commitdiff
|
tree
2010-01-30
Junio C Hamano
Merge
b
ranch 'maint
-
1
.
6
.
5' into main
t
commit
|
commitdiff
|
tree
2010-01-30
Johannes Si
x
t
I
m
pl
e
m
ent pthr
e
ad_co
n
d_broadcas
t
o
n
Win
d
ows
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-30
S
e
ba
s
tian Sch
u
b
erth
If deriving SVN_SSH
from
GIT_SSH on
m
sy
s
, a
l
so
add
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-29
Junio C H
a
man
o
Mer
g
e
git://
g
i
t
.
k
e
rne
l
.
o
rg/pub/scm/git
k
/
g
itk
commit
|
commitdiff
|
tree
2010-01-29
Jeff King
add shebang
line t
o
g
i
t-mergetool--lib
.
sh
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next