repo.or.cz
/
git
/
jnareb-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge-file: add option to select union merge favor
2010-03-03
B
e
rt Wesar
g
m
e
rge-file:
a
d
d
optio
n
to
select unio
n
mer
g
e favor
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-03
Bert W
e
sarg
merge-file: add o
p
tion to specify the mar
k
er size
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-02
Bert Wesarg
refactor me
r
ge f
l
ags into
x
mparam_t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-02
Bert Wesarg
make union merge an xdl merge favor
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-12
Ju
n
io C Hamano
G
it 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-12
Junio C Hamano
Mer
g
e branch 'mai
n
t'
commit
|
commitdiff
|
tree
2010-02-12
Junio C Haman
o
Fix typo in 1
.
6
.
6
.
2 releas
e
no
t
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-12
Junio C Ha
m
ano
Re-fi
x
check-ref-format
d
ocumentation mark-up
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-12
Junio C
Hamano
a
r
chiv
e
do
c
umenta
t
ion: attributes are ta
k
en from the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-12
Micha
e
l J Gr
u
b
er
Doc
u
ment
a
tion:
m
in
o
r
f
ixes to
R
elNo
t
es-1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-12
SZEDER Gábor
bash: su
p
po
r
t 'git am's
new '--
c
o
ntinue' option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-12
Juni
o
C Ham
a
no
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2010-02-12
Jacob Helwig
filter-branch: Fix error
message for --prune-empty
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-12
Jeff
Kin
g
am: switc
h
--resolved to --continue
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-10
Junio C Hamano
Upda
t
e draft relea
s
e no
t
es
t
o
1
.
7
.
0 one more time
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-10
Junio C Hamano
Sync
wi
t
h 1
.
6
.
6
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-10
Ju
n
i
o C Hamano
G
it
1
.
6
.
6
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-10
Junio C H
a
mano
M
erg
e
branch 'maint-1
.
6
.
5' in
t
o mai
n
t
commit
|
commitdiff
|
tree
2010-02-10
Jun
i
o C Hamano
t
8003: check exit
code of command and error message
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-10
J
uni
o
C Hamano
Merge branch 'sp/mai
n
t-fast-import
-
l
a
r
g
e-blob' into
.
.
.
commit
|
commitdiff
|
tree
2010-02-10
Junio C Hamano
Merge bra
n
ch
'
gp/mai
n
t-cvsserver' into maint
commit
|
commitdiff
|
tree
2010-02-10
Junio C Hamano
Merge branch 'jc/
m
a
int-reflo
g
-bad-
t
imest
a
mp' i
n
to maint
commit
|
commitdiff
|
tree
2010-02-10
Ju
n
io C Hamano
Merge branch '
i
l/ma
i
nt-x
m
allocz' in
t
o mai
n
t
commit
|
commitdiff
|
tree
2010-02-10
Junio C
H
amano
M
erg
e
b
ranch 'jh/mai
n
t-config-file-p
r
efix' in
t
o m
a
int
commit
|
commitdiff
|
tree
2010-02-10
J
unio C Hamano
Me
r
ge branch 'nd
/
inclu
d
e-termios-for-oso
l
'
i
nto maint
commit
|
commitdiff
|
tree
2010-02-10
J
u
n
i
o C Hamano
Merge bra
n
ch 'jc/maint-1
.
6
.
1-checkout-m-custom-merge
.
.
.
commit
|
commitdiff
|
tree
2010-02-10
Juni
o
C Hamano
Merge branch 'rs/maint-archi
v
e-match-pathspe
c
' into
.
.
.
commit
|
commitdiff
|
tree
2010-02-10
Junio C Hamano
c
h
eck-r
e
f-format docume
n
tation: fix enu
m
er
a
tion mark-
u
p
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-10
Thomas Rast
D
o
cument
a
tion:
q
uote braces in {upstream} notation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-09
Bri
a
n
Ge
r
n
h
a
r
dt
t3902: Prote
c
t against OS X norm
a
li
z
at
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-09
Junio C Hamano
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2010-02-09
Jun
i
o C Hama
n
o
Merge br
a
nch 'mai
n
t-1
.
6
.
5' into mai
n
t
commit
|
commitdiff
|
tree
2010-02-09
Jay S
o
f
f
ian
bla
m
e:
p
revent a
s
egv wh
e
n -L given start > EOF
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-09
Junio C Ha
m
ano
M
erge bran
c
h 'jc/maint-push-doc-status' in
t
o
m
a
int
commit
|
commitdiff
|
tree
2010-02-09
Junio C
Hamano
g
it-push:
d
ocu
m
e
n
t all the
status
flags used in the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-08
Jun
i
o C Hamano
M
er
g
e branch 'jc/maint-i
m
ap-config-parse'
into
maint
commit
|
commitdiff
|
tree
2010-02-08
Junio
C
Ham
a
n
o
Fix pars
i
n
g of imap
.
pr
e
formattedHTML and imap
.
sslverify
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-08
Junio C Hamano
Merge
b
ranch 'jc/maint-doc-git-add-exam
p
le' into main
t
commit
|
commitdiff
|
tree
2010-02-08
Juni
o
C H
a
ma
n
o
git-add
d
ocumentat
i
on: Fix shell quoting
e
xampl
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-08
Nicolas Pitre
Revert "pack-
o
bjec
t
s: fix pack gen
e
rat
i
on whe
n
usin
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-07
Jun
i
o
C
H
amano
Merge git://repo
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
2010-02-07
J
u
n
i
o
C
H
a
m
ano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-02-07
René Scharfe
archiv
e
: simpl
i
fy
archive format guess
i
n
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-06
J
eff King
Fix
invalid read i
n
quote_c_style_cou
n
ted
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-06
Jeff King
docs:
fix f
i
lter-branch ex
a
m
p
l
e
for quoted paths
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-06
Brian Ger
n
h
a
rdt
t
9
501
:
Re-
f
ix max load test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-06
Björn Gustav
s
son
bash: support the --autosquash o
p
t
i
on for reba
s
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-06
Jun
i
o C Ha
m
ano
Merge git://g
i
t
.
ker
n
e
l
.
or
g
/pub
/
scm/gitk/gi
t
k
commit
|
commitdiff
|
tree
2010-02-06
B
r
ian
Gernhardt
t9501: Skip tes
t
ing l
o
ad if we ca
n
't detect it
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-06
Junio C Hamano
Update
d
raf
t
rele
a
se not
e
s to
1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-06
J
unio C Hamano
Merge
branch
'maint'
commit
|
commitdiff
|
tree
2010-02-05
W
e
s
ley J
.
La
n
daker
U
pdate git fsck --f
u
ll sho
r
t
des
c
ription
to mention
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-05
Junio C Hamano
M
erge bra
n
ch 'jc
/
main
t
-l
i
mit
-
note-output'
i
nto maint
commit
|
commitdiff
|
tree
2010-02-05
J
u
nio C Hamano
Revert 30816
2
3
7
a
n
d 7e
6
2265
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-04
Junio C
Hamano
fast-i
m
port: coun
t
--max-pack-size in bytes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-04
Nicolas P
i
t
r
e
updat
e
g
i
t-repack documen
t
ation wr
t
r
epac
k
.
UseDeltaBaseOffset
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-04
Michael J G
r
uber
git-cl
e
an: fix the description of the defa
u
lt behavior
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-04
Junio C Hamano
fast-
i
mport
.
c: F
i
x big-fi
l
e-th
r
eshold parsing bug
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-04
Nico
l
a
s Pi
t
re
ma
k
e
--max-pack-size argument to
'
git pa
c
k-o
b
j
e
ct'
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-04
Nicolas Pitre
pack-objects: fix
pack gen
e
ra
t
ion when usin
g
p
a
ck_size_limit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-04
Nicolas P
i
tre
fix multiple i
s
sues with t5300
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-04
John 'Warth
o
g9'
.
.
.
gitweb: Simplify (and f
i
x)
c
hop_
s
tr
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-03
Re
n
é Scharfe
grep: sim
p
lify as
s
ignme
n
t
of ->fixed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-03
Junio
C
Hamano
M
e
rge
b
r
an
c
h 'm
s
/fi
l
ter-branch-submodule'
commit
|
commitdiff
|
tree
2010-02-03
Junio C Hamano
Merg
e
branch
'
jh
/
gitweb
-
caching' (early pa
r
t)
commit
|
commitdiff
|
tree
2010-02-03
Junio C Haman
o
Merge branch 'bw/n
o
-python-au
t
oconf
'
commit
|
commitdiff
|
tree
2010-02-03
Jun
i
o C Hamano
Merge
b
ranc
h
'sp/fast-import-large-blob'
commit
|
commitdiff
|
tree
2010-02-02
Shawn
O
.
P
e
arce
Correct spelling of 'REUC' extensio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-02
Ju
n
io C Hamano
build: make co
d
e
"-W
p
o
inte
r
-arith" clean
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-01
Ben Wal
t
on
configure
:
Allow --w
i
th
o
u
t
-python
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-01
Ben Walton
configure: Allow
G
IT_ARG_SET_PATH to h
a
ndle
-
-without
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-01
Jun
i
o
C
Hamano
Merge br
a
nch 'sp/maint-fast-
i
mport-l
a
rge-blob' into
.
.
.
commit
|
commitdiff
|
tree
2010-02-01
S
hawn
O
.
Pearce
fa
s
t-import: Stream v
e
ry la
r
ge blobs directl
y
t
o pack
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-01
Pal-Kristia
n
Engstad
g
it-p4: Fix sync erro
r
s
due to ne
w
s
e
rver version
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-01
Jens
L
ehma
n
n
Updates for dirty submodules in relea
s
e notes and user
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-01
Junio C
H
amano
Merge branch 'sb/
m
aint-oct
o
pus' into maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-02-01
Junio C Hamano
Merge bran
c
h
'
bg/ma
i
nt-add-all-
d
oc' into
maint
-
1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-31
Junio C H
a
m
a
no
U
p
d
a
t
e draft rel
e
a
se notes to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-31
Junio C Hamano
Merge b
r
anch 'dm/m
a
ke-t
h
readed-simplify'
commit
|
commitdiff
|
tree
2010-01-31
Dan McGee
Make
NO_PTHREADS th
e
sol
e
thread config
u
ra
t
ion v
a
riable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-31
Ju
n
io C Hamano
RPM packa
g
ing: use %globa
l
inside %{!?
.
.
.
}
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-31
Jeff King
mention new
s
hell
e
xecution behavior i
n
relea
s
e
not
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-31
Jens Lehma
n
n
Fix m
e
m
o
ry leak i
n
submo
d
ule
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-31
Ra
l
f Wilde
n
hues
Fix typos i
n
technical docume
n
tation
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-30
J
ohn 'Warthog9
'
.
.
.
gitweb: Add o
p
tional extr
a
param
e
ter to die_error,
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-30
John 'Wartho
g
9'
.
.
.
g
i
tweb
:
a
dd a "str
i
n
g" variant
o
f print_sort_th
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-30
J
ohn 'W
a
r
thog9'
.
.
.
gitweb
:
add
a "string" va
r
iant of print_local_time
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-30
John 'Warthog9'
.
.
.
gi
t
web:
Check th
a
t $site_he
a
de
r
etc
.
are defined bef
o
re
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-30
John 'Warthog9'
.
.
.
gitweb: Makefile i
m
p
rov
e
ments
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-30
J
ohn 'Warthog9'
.
.
.
gitweb:
L
oad che
c
king
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-30
Jakub Nar
e
bsk
i
gitweb: Make r
u
nning t9501 test with
'--de
b
ug' reli
a
ble
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-30
Jun
i
o
C
Hamano
is_s
u
b
modu
l
e_modified
(
): fix breakage
with e
x
te
r
na
l
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-30
J
u
nio C Haman
o
RP
M
p
ackaging: d
o
n
'
t
i
nclu
d
e for
e
ign
-
s
cm-helper
bits yet
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-30
D
a
n McGee
grep
:
Fix two memory
l
e
aks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-30
M
arkus Heidelberg
rebas
e
: don't invok
e
th
e
pager for ea
c
h
com
m
i
t summa
r
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-30
Junio C Ha
m
a
no
U
pd
a
t
e
draft
r
elease n
o
tes
t
o 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-30
Junio
C
Hamano
Me
r
ge bra
n
ch
'
m
aint'
commit
|
commitdiff
|
tree
2010-01-30
Junio C Hamano
Merg
e
br
a
nch '
m
aint-1
.
6
.
5' int
o
maint
commit
|
commitdiff
|
tree
2010-01-30
Johannes
Sixt
Implement pt
h
read_con
d
_broadcast on Windows
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-30
S
e
bas
t
ian Schube
r
th
If deriving
S
V
N
_
S
SH
f
r
o
m G
I
T_SSH
on msys
,
also add
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next