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
Elijah N
e
wren
pull --rebase
:
Avoi
d
spuriou
s
conflic
t
s
and r
e
applying
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-13
Elijah Newren
t
5
5
2
0-p
u
ll:
Ad
d
testcases
s
howing spurious conflicts
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-12
Junio C Hamano
Git 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-12
Junio C
Hamano
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2010-02-12
Junio C
H
a
m
ano
F
i
x
t
ypo
in 1
.
6
.
6
.
2 release note
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-12
Junio C Hama
n
o
Re-
f
ix check-ref-format
d
o
cu
m
ent
a
tion
ma
r
k-u
p
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-12
Junio
C
H
amano
archive
documentation:
a
ttribute
s
a
r
e taken from the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-12
Mic
h
ael J Gruber
Documentati
o
n
:
minor fixes
to RelNotes
-
1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-12
SZEDER Gábor
bash: suppor
t
'git am
'
s new '--continue' opti
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-12
J
u
nio C Hamano
Merg
e
branch 'main
t
'
commit
|
commitdiff
|
tree
2010-02-12
Jacob Helwig
filte
r
-
branch: Fix error messa
g
e for --prune-emp
t
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-12
Jeff King
am: switch
-
-res
o
l
ved to --c
o
ntinue
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-10
Junio
C
H
a
m
ano
Update draft release notes t
o
1
.
7
.
0 one more
tim
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-10
Junio C Haman
o
Sync w
i
th
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
Junio C
H
am
a
no
Merg
e
br
a
n
ch 'maint-1
.
6
.
5' i
n
t
o maint
commit
|
commitdiff
|
tree
2010-02-10
Ju
n
io
C Hamano
t
8003: check exit co
d
e
o
f command and
e
rror m
e
ss
a
ge
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-10
Junio C H
a
man
o
Merge br
a
n
c
h 's
p
/maint-fast-import-lar
g
e-blob' into
.
.
.
commit
|
commitdiff
|
tree
2010-02-10
Junio C
Ha
m
a
n
o
M
e
rg
e
branch 'gp/maint-cvsserver' into maint
commit
|
commitdiff
|
tree
2010-02-10
Junio C Hamano
M
erge branch 'jc/ma
i
nt-
r
eflog-
b
a
d
-
timestamp' into ma
i
n
t
commit
|
commitdiff
|
tree
2010-02-10
Jun
i
o C H
a
mano
M
erge branch 'il/m
a
int-x
m
allocz' into maint
commit
|
commitdiff
|
tree
2010-02-10
Junio C Haman
o
Merge branc
h
'jh/main
t
-
c
o
nfig-fil
e
-prefix' into maint
commit
|
commitdiff
|
tree
2010-02-10
J
u
nio C Hamano
M
e
r
g
e br
a
nch 'n
d
/inclu
d
e-ter
m
io
s
-for-o
s
ol' into maint
commit
|
commitdiff
|
tree
2010-02-10
Junio C Hamano
Merg
e
br
a
nch 'jc/ma
i
nt-
1
.
6
.
1-ch
e
ck
o
ut-m
-
custom-merge
.
.
.
commit
|
commitdiff
|
tree
2010-02-10
Jun
i
o C Hamano
Merge branch 'r
s
/
m
aint-archive-mat
c
h
-
p
ath
s
pec' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2010-02-10
Junio C H
a
mano
ch
e
ck-
r
ef-
f
ormat documen
t
atio
n
:
f
ix enume
r
ation mark-up
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-10
T
h
o
mas Rast
Documentation: quo
t
e
bra
c
es
in {upstr
e
am} notation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-09
Brian Gernhardt
t3902: Protect
against
O
S X no
r
mal
i
zation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-09
Junio C Hamano
Merg
e
bra
n
ch 'main
t
'
commit
|
commitdiff
|
tree
2010-02-09
J
unio C Hamano
Merge bran
c
h 'maint-1
.
6
.
5' int
o
ma
i
nt
commit
|
commitdiff
|
tree
2010-02-09
Jay
S
offian
blame: pre
v
ent a segv when -L given start > EOF
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-09
J
unio C Ha
m
a
n
o
Merge branch 'jc/maint
-
pus
h
-doc-status' into maint
commit
|
commitdiff
|
tree
2010-02-09
Junio C Ha
m
ano
g
i
t-push: docume
n
t all the status flags
u
sed in the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-08
Junio
C Hama
n
o
M
e
rge branch 'jc
/
m
aint-
i
m
ap-config-pa
r
se'
into main
t
commit
|
commitdiff
|
tree
2010-02-08
Jun
i
o C Hamano
Fi
x
pars
i
ng of imap
.
pr
e
f
o
rmat
t
edHTML a
n
d imap
.
s
s
lve
r
i
f
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-08
Ju
n
io C Hamano
Merge bran
c
h 'jc/maint-doc-gi
t
-add-exam
p
le' in
t
o
maint
commit
|
commitdiff
|
tree
2010-02-08
Jun
i
o
C
Hama
n
o
git-
a
d
d
do
c
umentation: Fix shell quoting example
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-08
Nicola
s
Pitre
Rev
e
rt "pack-objects: fix
p
ack gene
r
ation when u
s
in
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-07
J
u
nio C H
a
mano
Mer
g
e git://repo
.
or
.
c
z
/git-gui
commit
|
commitdiff
|
tree
2010-02-07
Junio
C Hamano
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2010-02-07
René Sc
h
arfe
archive: simplify a
r
chi
v
e format guessing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-06
J
e
f
f King
Fi
x
invalid re
a
d in quote_c_style_counted
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-06
J
e
ff King
docs: fix filter-branch example fo
r
quoted paths
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-06
Brian Gernhardt
t9
5
01: Re-fix m
a
x load test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-06
B
j
örn Gusta
v
sson
bash: support the --a
u
tosquash opti
o
n f
o
r rebase
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-06
Junio C Hamano
Merge git://git
.
k
ernel
.
org
/
pub/sc
m
/
gitk/gitk
commit
|
commitdiff
|
tree
2010-02-06
Bria
n
G
e
rnhardt
t
9
501: Skip tes
t
ing load if we ca
n
't detect i
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-06
Junio C Hamano
Upd
a
te draft release notes
t
o 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-06
Ju
n
io C
H
amano
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2010-02-05
Wesley J
.
Landaker
Update
git fsck --full short desc
r
i
p
t
i
on to menti
o
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-05
Junio C
H
amano
Merge
branch
'jc/maint-limit
-
note-output'
i
n
to maint
commit
|
commitdiff
|
tree
2010-02-05
J
u
nio C Hamano
Rever
t
30816237 and 7e62265
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-04
Junio C Ha
m
ano
fa
s
t-impo
r
t: co
u
nt --
m
ax-p
a
c
k
-size
in bytes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-04
Nicolas Pi
t
r
e
update git-r
e
pa
c
k doc
u
mentation wrt repack
.
UseDeltaBaseO
f
fs
e
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-04
M
ichae
l
J Gruber
git-clean
:
fix the descr
i
pti
o
n of
t
h
e
d
e
f
a
ult behavior
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-04
Junio C
Hamano
fast-
i
mpo
r
t
.
c:
F
i
x b
i
g-file-threshold parsing bug
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-04
N
icolas Pitre
mak
e
--max-pa
c
k
-
size
a
rgument to 'git pac
k
-object'
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-04
Nicolas
Pitre
p
a
c
k-objec
t
s: fix
p
ack gene
r
ation wh
e
n using pack_
s
ize_limit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-04
Nicolas Pitre
fi
x
multiple is
s
u
e
s
with t5300
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-04
Joh
n
'Warthog9'
.
.
.
git
w
eb: Simpli
f
y
(and fix) cho
p
_str
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-03
René Scharfe
grep: simplify assignment o
f
->fix
e
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-03
Junio C Hamano
Merge bra
n
ch 'ms/
f
ilt
e
r-branch-submodule'
commit
|
commitdiff
|
tree
2010-02-03
Junio C Hamano
Merge branch 'j
h
/gitweb-caching' (e
a
rly
p
art)
commit
|
commitdiff
|
tree
2010-02-03
Junio C Hamano
Me
r
ge br
a
nch 'bw/no-python-autoc
o
n
f
'
commit
|
commitdiff
|
tree
2010-02-03
Junio
C
Hamano
Merge branch 's
p
/fa
s
t-import-large-bl
o
b'
commit
|
commitdiff
|
tree
2010-02-02
Shawn O
.
Pea
r
ce
Correct spelling of
'RE
U
C' e
x
tension
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-02
Junio
C Hamano
build: make cod
e
"-Wpoi
n
ter-arith" clea
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-01
Ben
Walto
n
c
onfigure: Allow --wi
t
hout-py
t
hon
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-01
Ben Walton
con
f
igure:
A
llow GIT_ARG_SET_PATH to
handle --w
i
thout
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-01
Ju
n
io C Hamano
Merge
br
a
nch
'
sp/main
t
-fast-impo
r
t-large-blob' into
.
.
.
commit
|
commitdiff
|
tree
2010-02-01
Shawn O
.
Pearce
fast-impo
r
t: Stream very
l
arge blobs directly
to pack
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-01
Pal-Kristian
Eng
s
tad
git-p4: Fix sync errors due to
n
ew server versio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-01
Jens
Lehmann
Updat
e
s for di
r
ty submo
d
u
les
in release notes and user
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-01
Junio
C
Hamano
Me
r
ge
b
ranch
'
sb/maint-oc
t
opus' into maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-02-01
J
u
n
i
o C Hamano
M
e
r
ge bra
n
ch '
b
g
/
main
t
-a
d
d-all-
d
oc' into
m
ain
t
-
1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-31
Jun
i
o C H
a
mano
U
p
d
a
te draft re
l
ease not
e
s to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-31
Ju
n
io C
Hama
n
o
M
e
rge branc
h
'
d
m
/make-threaded-
s
implif
y
'
commit
|
commitdiff
|
tree
2010-01-31
D
a
n
McGee
Make NO_PTH
R
EADS the sole thread configuration variable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-31
Junio C
Ham
a
no
RPM
p
a
ckaging: use %global
i
nside %{!?
.
.
.
}
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-31
Jeff
K
i
n
g
menti
o
n
new shell e
x
ecutio
n
behavior
in r
e
l
eas
e
not
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-31
Jens Lehm
a
nn
Fix memo
r
y
leak in
s
ubmodule
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-31
R
a
l
f Wildenhues
F
ix typos in technical documentatio
n
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-30
John
'Warthog9'
.
.
.
gitwe
b
: Ad
d
optional ext
r
a p
a
rameter
t
o
die_error,
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-30
John 'Wartho
g
9'
.
.
.
gitweb:
a
dd a "string
"
va
r
iant o
f
p
rint_s
o
rt_th
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-30
John 'Warthog9'
.
.
.
g
itweb: add a "strin
g
" vari
a
nt of p
r
int_l
o
cal_time
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-30
Jo
h
n 'Wa
r
th
o
g
9'
.
.
.
gitweb: C
h
eck t
h
at $
s
i
t
e
_
header
e
tc
.
are
d
efi
n
e
d befor
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-30
J
ohn 'Warthog9'
.
.
.
git
w
eb
:
M
akef
i
le
i
mprovem
e
nts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-30
J
o
hn
'
W
a
r
thog9'
.
.
.
g
i
t
web: Loa
d
check
i
ng
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-30
Jakub Narebski
gitw
e
b: M
a
ke running t9501 test with '-
-
debug' reliable
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-30
Junio
C
Hamano
is_submodule_modified():
f
i
x
breakage with e
x
ternal
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-30
Ju
n
io C
H
amano
RP
M
packaging: don't
incl
u
d
e foreign
-
scm-
h
elper b
i
ts yet
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-30
Dan McGee
g
r
e
p
: Fix two me
m
ory leaks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-30
M
a
r
kus Hei
d
elbe
r
g
rebase
:
don
'
t invoke the page
r
fo
r
eac
h
commi
t
s
u
mmary
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-30
Junio C Hamano
Upd
a
te draft release notes to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-30
J
unio C Hamano
Merge
branch 'maint'
commit
|
commitdiff
|
tree
2010-01-30
Junio C Ham
a
no
Me
r
ge branch
'maint-1
.
6
.
5' i
n
to mai
n
t
commit
|
commitdiff
|
tree
2010-01-30
Johann
e
s
Sixt
Impleme
n
t pthread_cond_broadcast on Windows
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-30
S
ebastian
Sc
h
uberth
I
f
deriving SVN_S
S
H from GI
T
_SSH on m
s
ys, also add
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-29
Juni
o
C Hamano
Merge
g
it://git
.
ker
n
e
l
.
org/pub/scm/g
i
t
k
/gitk
commit
|
commitdiff
|
tree
2010-01-29
Jeff K
i
ng
add shebang line to git-merge
t
ool-
-
lib
.
sh
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next