repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'jc/pull-signed-tag'
2011-12-12
Ga
r
y
Gibbons
git-p4: ensure submit
c
l
i
e
ntPath e
x
ists
b
ef
o
r
e
c
h
dir
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-12-10
J
eff King
fetch: create status table u
s
i
ng strbuf
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-12-09
Jun
i
o C
H
a
mano
Update dra
f
t re
l
ease no
t
es f
o
r 1
.
7
.
9
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-12-09
Junio
C
Haman
o
M
e
rge
branch 'sg/complete-refs'
commit
|
commitdiff
|
tree
2011-12-09
Junio
C
Hamano
Merge branch 'n
d
/resolve-r
e
f'
commit
|
commitdiff
|
tree
2011-12-09
Ju
n
i
o
C Hamano
Merge br
a
nch
'
jc/pu
l
l-signed-tag
'
commit
|
commitdiff
|
tree
2011-12-09
J
unio C Haman
o
Merge branch 'jc/reques
t
-
pull-
s
how-head-4'
commit
|
commitdiff
|
tree
2011-12-09
Junio C Haman
o
Merg
e
b
r
anch 'ab
/
pull
-
r
e
base-config'
commit
|
commitdiff
|
tree
2011-12-09
J
u
n
io C Hamano
Me
r
ge
b
ranc
h
'rs/allocate-cache-
e
ntry-individually'
commit
|
commitdiff
|
tree
2011-12-09
Junio C Hamano
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2011-12-09
Junio C Hamano
M
erge b
r
an
c
h 'maint-1
.
7
.
7' i
n
to maint
commit
|
commitdiff
|
tree
2011-12-09
Ramkumar Ramacha
n
dra
t3040 (subproject
s
-bas
i
c): fix '&&' chainin
g
, modernize
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-12-09
Martin
v
on
Zweigb
e
rgk
am: don't per
s
ist keepcr flag
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-12-09
Erik Faye
-
Lun
d
min
g
w
: giv
e
waitpid t
h
e corre
c
t signat
u
r
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-12-09
Ramkumar Ramachandr
a
t
1
510 (worktree)
:
fix '&&' chain
i
ng
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-12-09
R
amk
u
mar Rama
c
handra
t
3030 (merge-re
c
ursive): use
te
s
t_expect_code
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-12-09
Kirill
A
.
Shutemov
git
-
ta
g
: introduce --clea
n
up option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-12-09
Ramkuma
r
Rama
c
handra
test: fix '&&' chain
i
ng
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-12-09
Ramkumar
R
amachandra
t
3
2
00 (branc
h
): fix '&&
'
chai
n
ing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-12-08
Jon
a
than Nieder
test: co
m
mit --amend sho
u
ld
honor -
-
n
o
-edi
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-12-08
Junio C H
a
m
ano
c
o
mmit
:
honour --no-edi
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-12-08
Jo
n
athan
N
ieder
t7501 (c
o
mmit): m
o
dern
i
ze style
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-12-08
Jonat
h
an Nieder
test: remo
v
e
a
p
o
rcelain te
s
t tha
t
hard-codes commi
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-12-08
Jonatha
n
Nieder
t
e
st: add missing "&&" after echo co
m
mand
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-12-08
Jens Lehm
a
nn
d
if
f
/statu
s
:
p
r
i
nt submo
d
ule path when
looking for
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-12-08
Mic
h
ael Haggerty
git
s
y
m
bolic-re
f
: docum
e
n
t
ation fix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-12-06
Thoma
s
Ra
s
t
reset:
update cache-tree
data when appr
o
priate
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-12-06
Thomas
Rast
commit: write cache-tre
e
da
t
a when writing index anyway
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-12-06
Thomas Rast
Refactor cache_t
r
ee_update idiom from commit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-12-06
T
homas Rast
Te
s
t
t
he
c
urrent state of t
h
e
cache-tree optimizat
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-12-06
T
h
o
mas Rast
Add test-scrap-cache
-
tree
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-12-06
J
u
nio C Hamano
c
h
e
c
kout -m: no need to ins
i
st on ha
v
ing all 3 stages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-12-06
Thom
a
s
R
a
st
userdiff
:
allow
* between c
p
p
funcnam
e
wo
r
ds
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-12-06
Eric Won
g
ena
b
le SO_KEEPALIVE for connected TCP so
c
k
ets
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-12-06
Junio C Hamano
Merge branch 'mas
t
er
'
of git://bo
g
o
mips
.
org/g
i
t-s
v
n
commit
|
commitdiff
|
tree
2011-12-06
Ævar Ar
n
fjörð Bjarmason
i18n: add
i
nfrastru
c
tur
e
for t
r
anslatin
g
G
it with
g
e
t
text
...Erik Faye-Lund, Peter Krefting,
Junio C Hamano
, Thomas Rast and
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-12-06
N
g
uyễn Thái Ngọc Duy
Co
p
y resolv
e
_ref() retur
n
value for longe
r
use
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-12-05
J
u
ni
o
C Hamano
Kic
k
-
o
ff the 1
.
7
.
9
c
ycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-12-05
Junio
C
Hamano
Merge br
a
nch 'jk
/
refre
s
h-porcel
a
in-output'
commit
|
commitdiff
|
tree
2011-12-05
J
unio C
H
aman
o
Merge branch 'gh/
u
se
r
diff-matlab'
commit
|
commitdiff
|
tree
2011-12-05
Jun
i
o
C
Hamano
Merg
e
branch 'nd/maint-ignor
e
-
e
x
c
l
u
de
'
commit
|
commitdiff
|
tree
2011-12-05
Junio C Hamano
Merge branch
'
vr/
g
it-me
r
ge-
d
efault-to-
u
pstream'
commit
|
commitdiff
|
tree
2011-12-05
Junio C Ham
a
no
Merge b
r
an
c
h 'jc/
m
ain
t
-pac
k
-object
-
cycle
'
commit
|
commitdiff
|
tree
2011-12-05
J
unio C Hamano
Me
r
ge branch 'jc/index
-
pack-reject-dups'
commit
|
commitdiff
|
tree
2011-12-05
J
uni
o
C Hamano
Merge branch
'
v
r
/msvc'
commit
|
commitdiff
|
tree
2011-12-05
J
u
nio C Hamano
M
erge bran
c
h 'na/st
r
toima
x
'
commit
|
commitdiff
|
tree
2011-12-05
Junio C Ha
m
ano
Me
r
ge
b
ran
c
h 'ab/
c
lang-lints'
commit
|
commitdiff
|
tree
2011-12-05
Junio C Hamano
Me
r
ge b
r
an
c
h 'nd
/
p
r
une-p
r
ogress
'
commit
|
commitdiff
|
tree
2011-12-05
Junio C Hama
n
o
Mer
g
e branch 'n
d
/
f
sck-p
r
ogress'
commit
|
commitdiff
|
tree
2011-12-05
Junio C
H
am
a
no
Merge br
a
nch 'mf/c
u
rl-s
e
lect-fds
e
t'
commit
|
commitdiff
|
tree
2011-12-05
Junio C Ha
m
ano
Me
r
ge br
a
nch 'nd/misc-cleanups'
commit
|
commitdiff
|
tree
2011-12-05
Junio C Hamano
Me
r
ge branc
h
'maint'
commit
|
commitdiff
|
tree
2011-12-05
J
unio C Haman
o
Me
r
ge branch 'main
t
-1
.
7
.
7' into maint
commit
|
commitdiff
|
tree
2011-12-05
Jun
i
o C
H
amano
M
e
rge bran
c
h 'm
a
int-1
.
7
.
6' in
t
o maint-
1
.
7
.
7
commit
|
commitdiff
|
tree
2011-12-05
Jeff King
strips
p
ace: fix outda
t
ed comment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-12-05
Pete
Wyckoff
git-p4
:
i
n
troduce skipSubmitEdi
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-12-05
Sebastian Morr
A
dd MYMETA
.
y
ml t
o
p
e
r
l
/
.
gitignore
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-12-05
Bran
d
o
n
Ca
s
ey
builtin/ap
p
l
y
.
c
:
report error on failure to re
c
ognize
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-12-05
B
randon Casey
t
/t41
3
1-apply-
f
ake-
a
ncestor
.
sh: fix b
r
oken
test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-12-05
Junio C Hamano
Mer
g
e
br
a
nch 'js/
m
e
r
ge-edit
-
option'
commit
|
commitdiff
|
tree
2011-12-05
Ja
c
k Nagel
D
o
c
u
m
entation: fix form
a
tting error in merge-options
.
txt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-12-02
Junio C H
a
mano
Git 1
.
7
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-12-01
Junio C Haman
o
b
ulk-checkin: re
p
lac
e
fast-imp
o
rt based implem
e
ntation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-30
Junio C H
a
mano
csum-file: introduce sha1
f
i
le_ch
e
ckpoint
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-30
Andre
w
Won
g
r
e
base -i: interrupt reb
a
se
when "commit --
a
m
e
n
d"
f
ailed
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-29
Johan
H
erland
fast-import: Fix inco
r
rect f
a
nout le
v
el when
modifying
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herland
t930
1
: Add 2n
d
testcase
e
xposing
bu
g
s
i
n f
a
st
-
import
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-29
Jo
h
an He
r
land
t
9
30
1
: Fix testcase cove
r
ing up a bug in f
a
st-import
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-28
J
u
nio C H
a
mano
Git 1
.
7
.
8-rc4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-28
Jo
n
athan N
i
e
d
er
Allo
w
checkout -B <curre
n
t-br
a
n
ch> t
o
up
d
ate th
e
curr
e
nt
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-28
J
o
na
t
h
a
n
N
ieder
branch: allow a no-
o
p "bra
n
ch
-
M <current-bra
n
ch
>
HEAD"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-28
Ca
r
los Ma
r
t
í
n Nie
t
o
convert:
track state
in
L
F-to-CRLF fil
t
er
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-28
Ng
u
yễn Thái Ng
ọ
c
D
uy
checkout,me
r
g
e
: d
i
sallow overwritin
g
i
gnored files
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-28
Junio C
Haman
o
Merg
e
br
a
nch 'nd/mai
n
t-ignore
-
exc
l
ude' into nd/ignore
.
.
.
commit
|
commitdiff
|
tree
2011-11-28
Nguyễn Thái Ng
ọ
c
Duy
c
heckout,merge: loosen ov
e
rwriting u
n
tracked file check
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-23
Junio C Haman
o
Merge branch 'maint' into
tj
/
i
m
a
p-send-remove-unused
commit
|
commitdiff
|
tree
2011-11-23
T
h
omas Jarosch
imap-send: Remove un
u
s
e
d 'use_na
m
espace' varia
b
le
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-23
V
incent va
n
R
a
v
e
s
t
eijn
b
uiltin-
r
ese
t
:
D
ocu
m
enta
t
i
o
n
update
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-23
Vi
n
cent
v
an
R
a
vesteijn
bui
l
tin
-
b
r
anch: Fi
x
crash on invalid
use of --force
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-23
Jonathan Nieder
r
e
vert
-
-abort: do not leave behind useless
s
equencer
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-23
Johannes Six
t
Fi
x
revert
-
-abort on Windows
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-23
Nguyễ
n
Thái Ngọc Duy
revert: do not pass n
o
n-literal strin
g
as f
o
r
m
a
t
to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-23
Junio C Hama
n
o
U
p
da
t
e 1
.
7
.
8 d
r
a
f
t release notes in prepar
a
tion for rc4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-23
Ju
n
io C Hamano
Merge branch
'
j
n/re
v
ert-quit'
commit
|
commitdiff
|
tree
2011-11-23
Jonatha
n
Nieder
rever
t
: remo
v
e
--rese
t
com
p
atib
i
l
i
ty option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-23
J
ona
t
ha
n
Nieder
r
evert: introduce -
-
a
b
ort to cancel
a failed ch
e
rry
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-22
Jonathan
N
ie
d
er
revert: write REVERT_HEAD pseudoref during conflicted
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-22
Jonathan N
i
e
de
r
revert: improve e
r
ror message for
che
r
ry-pic
k
d
u
ring
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-22
Jon
a
th
a
n
Nied
e
r
revert: rearrange pick_revisions() for clari
t
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-22
Jonathan Nieder
revert: rename --reset o
p
tion to --
q
u
i
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-21
Junio C Hamano
Mer
g
e bra
n
ch
'
jk
/
maint-1
.
6
.
2-
u
pload-a
r
chive' into jk
.
.
.
commit
|
commitdiff
|
tree
2011-11-21
Jeff King
archive: don't let remo
t
e clients
g
et unreachable commits
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-21
Jeff
K
ing
u
pload-archive:
u
se s
t
ar
t
_command instead o
f
fork
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-21
Junio C
Hamano
Merge bran
c
h 'ma
i
nt'
commit
|
commitdiff
|
tree
2011-11-21
Junio
C
H
a
mano
Merge
b
ranch '
r
r/misc-fix
e
s'
commit
|
commitdiff
|
tree
2011-11-21
Ramsay Jone
s
convert
.
c: Fix return type of g
i
t_path_check_eol()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-21
Vin
c
ent van
R
a
vesteijn
Sho
w
error for '
g
it m
e
rge'
w
i
th
u
nset merge
.
d
e
fa
u
ltToUps
t
ream
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-21
Thomas H
o
chstein
doc
u
me
n
tation
fix: git difftool
uses diff t
o
ols, not
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-21
Ramsay Jones
con
f
ig
.
c
:
Fix a static buffer overw
r
ite bug by avoi
d
ing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-21
Ramsay Jo
n
es
t5501-*
.
s
h
: F
i
x url
p
a
sse
d
to clon
e
in se
t
up t
e
st
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next