repo.or.cz
/
git
/
gitweb.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
El
i
jah Newren
pull --rebase: Avoid s
p
uri
o
us
conflicts and reappl
y
i
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-13
Elijah N
e
wre
n
t5520-pull: Add testcases
showing spurious conf
l
ict
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-12
Junio C Hama
n
o
Git 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-12
J
u
nio C Ham
a
n
o
Merge bra
n
c
h 'maint'
commit
|
commitdiff
|
tree
2010-02-12
Ju
n
io C Ha
m
a
n
o
Fix typo in 1
.
6
.
6
.
2
relea
s
e
notes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-12
Juni
o
C Hamano
Re-fix che
c
k-ref-fo
r
mat documentation m
a
rk-up
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-12
Junio C Hamano
archive docum
e
nta
t
ion: attr
i
b
u
tes
are
tak
e
n from the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-12
Mi
c
hael J Gruber
Documentation: min
o
r
f
ixes to RelNotes-1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-12
S
ZED
E
R Gábor
bash: suppo
r
t 'git a
m
's ne
w
'--continue' option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-12
Junio
C
H
amano
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2010-02-12
J
acob
Helwig
filte
r
-b
r
anch: Fix error message fo
r
--prune-empty
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-12
Jeff King
am: s
w
i
tch --resolve
d
to --continue
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-10
J
uni
o
C Hamano
Update draft relea
s
e notes to 1
.
7
.
0 one more time
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-10
Junio C
H
a
mano
Sync wit
h
1
.
6
.
6
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-10
Junio C Hama
n
o
Git 1
.
6
.
6
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-10
Junio
C Hamano
Merge branch 'maint-1
.
6
.
5' in
t
o maint
commit
|
commitdiff
|
tree
2010-02-10
J
u
nio C
H
amano
t8003:
check
exit
c
ode of com
m
and
an
d
error m
e
ssa
g
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-10
Junio C H
a
m
a
no
Merg
e
b
r
anch 'sp/ma
i
nt-fast-impor
t
-la
r
ge-b
l
ob' into
.
.
.
commit
|
commitdiff
|
tree
2010-02-10
Jun
i
o C Hamano
Merge branch 'gp/maint-cv
s
se
r
ver'
i
nto
maint
commit
|
commitdiff
|
tree
2010-02-10
Junio C Hamano
Merge branch 'jc/maint
-
reflog-b
a
d-timestamp' into maint
commit
|
commitdiff
|
tree
2010-02-10
Junio C Hamano
Merg
e
br
a
nch 'il/main
t
-x
m
a
l
locz' into maint
commit
|
commitdiff
|
tree
2010-02-10
Junio
C Haman
o
Merge bran
c
h 'jh/maint-config-file-prefix' into maint
commit
|
commitdiff
|
tree
2010-02-10
Junio C H
a
mano
Merge branch '
n
d/include-termio
s
-for-os
o
l' int
o
maint
commit
|
commitdiff
|
tree
2010-02-10
Junio C Hama
n
o
Mer
g
e branch
'
j
c
/maint-1
.
6
.
1-c
h
ecko
u
t-m-custom-merge
.
.
.
commit
|
commitdiff
|
tree
2010-02-10
J
u
nio C Hamano
Mer
g
e bra
n
ch
'rs/main
t
-archive-matc
h
-p
a
thspec' i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2010-02-10
Junio C Ha
m
ano
ch
e
ck-re
f
-
f
ormat documentation:
fix enu
m
eration mark-u
p
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-10
Tho
m
as R
a
st
Documentati
o
n: quote brac
e
s
in
{
u
p
stream} notati
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-09
Br
i
an
Gernhardt
t3
9
02: Protect against OS
X norm
a
l
i
zation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-09
Junio C
Ham
a
no
Merge
b
r
anch 'main
t
'
commit
|
commitdiff
|
tree
2010-02-09
Junio
C
Haman
o
Merge b
r
anch 'maint-1
.
6
.
5' into ma
i
nt
commit
|
commitdiff
|
tree
2010-02-09
J
a
y Soffian
b
lame: prevent a
s
egv when -L given star
t
>
EO
F
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-09
Junio C Hamano
Merge bran
c
h 'jc/maint-push-doc-status' into maint
commit
|
commitdiff
|
tree
2010-02-09
J
unio C Hamano
git
-
push:
docu
m
ent all the status
f
lag
s
used in
the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-08
Junio C Ha
m
ano
Merg
e
branch 'jc/
m
a
i
n
t
-imap-config-parse' into maint
commit
|
commitdiff
|
tree
2010-02-08
Junio C Hamano
Fix parsing of imap
.
preformat
t
edHTML and imap
.
ssl
v
erify
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-08
Junio C Hamano
Me
r
ge
branch
'
jc/main
t
-do
c
-
g
it-add-example' into main
t
commit
|
commitdiff
|
tree
2010-02-08
Junio C Haman
o
git
-
add documentation: Fix shell quoting examp
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-08
Nic
o
las Pitre
Revert "pack-objects: fix pack
gener
a
ti
o
n
w
hen
u
s
ing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-07
Ju
n
i
o
C Hamano
Merg
e
git://
r
epo
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
2010-02-07
J
u
nio C
Ham
a
no
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2010-02-07
René Scharfe
archive:
simpl
i
fy archiv
e
format guessing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-06
Jeff King
Fix in
v
a
l
id
read i
n
quo
t
e
_
c_style_counted
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-06
Jeff King
d
o
cs: fi
x
fi
l
t
e
r-branch exam
p
le for quote
d
paths
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-06
Brian
G
ernhardt
t9501: Re-fix ma
x
l
oad test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-06
B
j
örn Gustavsson
b
ash: support the --autosquash
o
p
t
ion f
o
r
reb
a
se
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-06
Junio C Hamano
Mer
g
e git://git
.
kernel
.
org
/
pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2010-02-06
Brian Gernhard
t
t9501: Skip testi
n
g load if we
can't de
t
e
c
t
it
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-06
Junio C Hama
n
o
Updat
e
dr
a
ft release notes to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-06
Jun
i
o
C Ha
m
ano
Merge
branch 'mai
n
t
'
commit
|
commitdiff
|
tree
2010-02-05
Wesley J
.
L
a
ndaker
U
p
d
ate
g
it fsck --full sh
o
rt description to mention
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-05
J
u
nio C Hamano
Merg
e
b
ranc
h
'
j
c/main
t
-
l
imit-n
o
te-output' into maint
commit
|
commitdiff
|
tree
2010-02-05
Junio C Ha
m
ano
Revert 308162
3
7 and 7e6226
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-04
Junio C Hama
n
o
fas
t
-import: c
o
unt --max-pack-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 g
i
t-
r
epack
documentatio
n
wrt re
p
a
c
k
.
U
s
eDelt
a
BaseOffset
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-04
Mich
a
e
l
J Gruber
g
it-clean: fix
t
he description of the d
e
fault behavior
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-04
Junio C Hamano
f
ast-import
.
c
:
Fi
x
big-file-thre
s
ho
l
d p
a
rsing b
u
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-04
Nicol
a
s Pitre
make --max-pack-siz
e
argument
to 'git pack-
o
bject'
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-04
Nicolas Pitre
pa
c
k
-
objects
:
fix
pack
generation when using pack_size_limit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-04
Nicolas Pitre
fix mult
i
pl
e
issues
w
ith t5300
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-04
John 'Wa
r
t
hog
9
'
.
.
.
gitweb:
S
i
mpl
i
fy (and fix) c
h
op_str
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-03
René Scharfe
grep: s
i
mpli
f
y
as
s
ignment
of ->fixe
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-03
Junio C Hamano
Merge branch '
m
s/filt
e
r
-
branch
-
submodu
l
e
'
commit
|
commitdiff
|
tree
2010-02-03
Junio C Hamano
M
erge branch 'j
h
/gitw
e
b-caching' (e
a
rly part)
commit
|
commitdiff
|
tree
2010-02-03
Junio C Ham
a
no
Me
r
ge branch 'b
w
/
n
o
-python-au
t
oconf'
commit
|
commitdiff
|
tree
2010-02-03
Ju
n
i
o C
Ham
a
no
Merge branch 'sp/fast-
i
mport-large-b
l
ob'
commit
|
commitdiff
|
tree
2010-02-02
Shawn O
.
P
earce
Correct
s
pelli
n
g of '
R
EUC' extension
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-02
Junio C
Hamano
bui
l
d: make code "-Wpointer-ar
i
th" cle
a
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-01
Ben Walton
configur
e
: Allow --wi
t
hout-python
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-01
Ben
Walton
c
onfigure:
A
llow GIT_ARG_SET_PATH to han
d
le --wit
h
out
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-01
J
u
nio
C Hamano
M
e
r
g
e branch 'sp
/
maint-
f
ast-impor
t
-large-blob' into
.
.
.
commit
|
commitdiff
|
tree
2010-02-01
Shawn O
.
Pearce
fast-import: Stream
very
l
arge bl
o
bs dire
c
tly to
p
a
ck
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-01
P
al-Kr
i
stian En
g
stad
git
-
p4: Fix sync
erro
r
s
d
ue to new ser
v
er
version
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-01
J
e
ns L
e
hmann
Updates for dirt
y
submodules in release
n
otes a
n
d user
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-01
Junio C
Hamano
M
erge
b
ranch 'sb/m
a
int-octopu
s
' into main
t
-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-02-01
Junio C Ham
a
no
Merge branch 'bg/ma
i
nt-add-al
l
-doc' into maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-31
Junio C Ha
m
ano
U
p
date
draft release n
o
tes t
o
1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-31
Junio C Hamano
Merge branch 'dm/make
-
t
hr
e
aded-
s
i
mplify'
commit
|
commitdiff
|
tree
2010-01-31
Dan
McGee
M
a
ke NO
_
P
THREADS the sole thread conf
i
guration
v
a
r
i
able
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-31
Junio C Haman
o
RPM p
a
ckaging: use %glob
a
l in
s
ide
%
{!?
.
.
.
}
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-31
Jeff
K
ing
mention
n
e
w
shel
l
execution beha
v
ior in re
l
e
a
se notes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-31
Jens Lehmann
Fix
m
emory
leak in submodule
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-31
Ralf Wil
d
enhues
Fi
x
typos
i
n tec
h
nical documentation
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-30
John 'War
t
hog9'
.
.
.
gitweb: Add
o
ptional ex
t
r
a paramete
r
to die_
e
rro
r
,
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-30
John 'Warthog9'
.
.
.
gitweb:
add a "string
"
varian
t
of print_sort_th
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-30
John 'Warthog9'
.
.
.
git
w
eb
:
a
dd a "string
"
variant of p
r
int_local
_
time
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-30
J
o
hn 'War
t
h
og9'
.
.
.
git
w
eb: Che
c
k that $sit
e
_h
e
a
der
e
t
c
.
are defined bef
o
re
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-30
John 'Warthog9'
.
.
.
gitweb: M
a
kefile improve
m
e
nts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-30
John
'Warth
o
g
9'
.
.
.
gitweb
:
Load c
h
e
cking
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-30
Jakub
Narebs
k
i
g
itweb:
M
a
k
e runnin
g
t9501 tes
t
with
'
-
-deb
u
g
'
reliable
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-30
Junio
C
Ham
a
no
is_su
b
module
_
modified
(
): fix breakage
w
ith exter
n
a
l
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-30
Junio
C Hamano
RPM
p
a
c
ka
g
ing: don't in
c
l
u
d
e f
o
r
e
i
g
n
-scm-helper bits
ye
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-30
Dan McGee
grep: Fix t
w
o memory leaks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-30
Markus Heidelbe
r
g
rebase:
don't invoke the pager fo
r
each commit
summar
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-30
Junio C H
a
mano
Update draft release notes
t
o 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-30
J
u
n
io C Ha
m
a
n
o
M
e
rge bran
c
h
'maint
'
commit
|
commitdiff
|
tree
2010-01-30
Junio
C
H
a
man
o
Me
r
ge b
r
anch 'maint-1
.
6
.
5' into maint
commit
|
commitdiff
|
tree
2010-01-30
Joh
a
nnes Sixt
Imp
l
ement pthread_
c
ond_bro
a
dcast
o
n Windows
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-30
Sebastian Schuberth
If derivi
n
g SVN_SSH from GIT_SSH on msys, also add
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-29
Junio C Ha
m
ano
Merge
g
it://git
.
ke
r
nel
.
o
rg/p
u
b
/
s
cm/gitk/gitk
commit
|
commitdiff
|
tree
2010-01-29
Jef
f
K
ing
add s
h
eb
a
ng line
to git-m
e
rgetool--lib
.
sh
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next