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/checkout-m-twoway'
2011-12-09
Junio C Hamano
M
e
rg
e
branch
'
mai
n
t'
commit
|
commitdiff
|
tree
2011-12-09
J
unio
C Hamano
M
erge branch 'maint-
1
.
7
.
7' i
n
to maint
commit
|
commitdiff
|
tree
2011-12-09
Ramkumar Ramach
a
ndra
t
3040 (s
u
bpro
j
ec
t
s-basi
c
): fix '&&' chaining
,
mo
d
ernize
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-12-09
Martin von Zwei
g
bergk
a
m: don't persist keepcr fla
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-12-09
Erik Faye-Lund
mingw: give waitpid t
h
e correct sig
n
ature
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-12-09
Ramkumar Ram
a
chandra
t1510 (w
o
rktr
e
e)
:
f
ix '&&
'
chaining
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-12-09
Ramkumar Ramachandr
a
t
3030 (merge-recursive): use t
e
s
t_expect_code
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-12-09
Kirill A
.
Shutemov
git-tag: intro
d
uce -
-
cl
e
anu
p
option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-12-09
Ramkumar Ramachand
r
a
test: fix '&&' chaining
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-12-09
Ramku
m
ar Ra
m
achandra
t3200 (branch
)
: fix '&&' chai
n
ing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-12-08
Jonatha
n
Nied
e
r
tes
t
: commit --am
e
nd
should h
o
nor --no-edit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-12-08
Junio C Hamano
comm
i
t
:
honour --no-edit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-12-08
Jonat
h
an Nied
e
r
t
7501 (commit): modernize style
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-12-08
J
onathan
N
ieder
tes
t
: remo
v
e a porcelain test that
h
ard-cod
e
s
co
m
mit
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-12-08
J
onathan Nieder
test: add missi
n
g "&&" afte
r
echo command
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-12-08
J
ens L
e
h
mann
d
i
ff/status:
print
s
u
b
module path
w
hen lookin
g
for
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-12-08
Micha
e
l Haggerty
git symbolic-ref:
d
ocu
m
entation
f
ix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-12-06
T
h
omas Ras
t
reset: update c
a
che-t
r
ee
d
a
ta when
ap
p
ropri
a
te
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-12-06
Thomas Rast
commit: write cache
-
tr
e
e d
a
ta
when
writing index any
w
ay
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-12-06
Thomas Ra
s
t
Refactor
cache_tree_upda
t
e i
d
iom from commit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-12-06
T
homas R
a
st
Test the
c
urrent state of th
e
cache-tree opt
i
miz
a
tion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-12-06
Thomas R
a
st
Add test-scr
a
p-cache-t
r
ee
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-12-06
J
unio C Ha
m
ano
checkout -m: n
o
need to
i
nsist on havin
g
all 3 stages
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-12-06
Thomas Rast
userdiff: allow * betw
e
en cpp f
u
n
cna
m
e wor
d
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-12-06
Junio
C
Hamano
M
erge branch '
m
aster' of git://
b
ogomips
.
org/g
i
t-svn
commit
|
commitdiff
|
tree
2011-12-06
Nguyễn Thái Ngọ
c
Duy
C
opy
r
e
s
o
l
ve_ref()
r
e
tur
n
v
a
lue f
o
r longer
use
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-12-05
Junio C
Hamano
Kick
-
off the 1
.
7
.
9 cycle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-12-05
J
un
i
o C
Hamano
Mer
g
e
b
ranch 'jk
/
r
e
f
r
esh-po
r
celain-output'
commit
|
commitdiff
|
tree
2011-12-05
Junio C Hamano
Merge branch 'gh/u
s
erdiff
-
m
a
tlab
'
commit
|
commitdiff
|
tree
2011-12-05
Junio C Hamano
Merge branch
'nd/maint-
i
g
n
ore-ex
c
lude'
commit
|
commitdiff
|
tree
2011-12-05
Jun
i
o
C
Hamano
M
er
g
e branc
h
'vr/git-merge-d
e
fa
u
l
t
-to
-
upstr
e
a
m
'
commit
|
commitdiff
|
tree
2011-12-05
Junio C Ham
a
no
M
erg
e
branch 'j
c
/main
t
-pack
-
object-cycle'
commit
|
commitdiff
|
tree
2011-12-05
Junio
C Hamano
Merge br
a
nch 'jc/i
n
dex-p
a
ck-reject-
d
u
p
s'
commit
|
commitdiff
|
tree
2011-12-05
J
u
nio C Ha
m
a
n
o
Merg
e
bra
n
ch '
v
r
/
m
s
vc
'
commit
|
commitdiff
|
tree
2011-12-05
J
u
nio C Haman
o
Merge
b
r
anch 'na/st
r
toimax'
commit
|
commitdiff
|
tree
2011-12-05
Junio C H
a
mano
Merge branch
'ab/
c
lang-lints
'
commit
|
commitdiff
|
tree
2011-12-05
Junio C Hamano
Merge branch 'nd/prune-pro
g
res
s
'
commit
|
commitdiff
|
tree
2011-12-05
Junio C Hamano
Merge branc
h
'nd/fsck-progress'
commit
|
commitdiff
|
tree
2011-12-05
J
u
nio C
H
ama
n
o
Merge branch 'mf
/
curl-s
e
lect-fdset'
commit
|
commitdiff
|
tree
2011-12-05
Junio
C
Hamano
Merge branch
'
nd/
m
isc-
c
leanups'
commit
|
commitdiff
|
tree
2011-12-05
Junio C Ham
a
no
Merge b
r
a
n
ch
'
m
a
int
'
commit
|
commitdiff
|
tree
2011-12-05
Jun
i
o C Hamano
Merge branch
'm
a
int-1
.
7
.
7
' into
mai
n
t
commit
|
commitdiff
|
tree
2011-12-05
Junio C
Hamano
M
e
rge branch
'ma
i
n
t
-1
.
7
.
6'
i
nto
m
aint-1
.
7
.
7
commit
|
commitdiff
|
tree
2011-12-05
Jef
f
King
stri
p
sp
a
ce: fix outdated comm
e
nt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-12-05
Pete Wyckoff
gi
t
-
p
4
:
introduce skipSubm
i
tE
d
i
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-12-05
Sebastian Morr
Add M
Y
META
.
y
m
l to perl/
.
git
i
gnore
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-12-05
Brandon Casey
b
u
i
ltin/
a
pply
.
c
:
repo
r
t error
o
n failure to
recogni
z
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-12-05
Brandon Casey
t/t4131-apply-
f
ake-ancestor
.
sh: fi
x
broken test
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-12-05
J
u
n
io C Hamano
Merge branch 'js/m
e
rge
-
edit-option
'
commit
|
commitdiff
|
tree
2011-12-05
Jac
k
Na
g
el
Documen
t
ation: fix formatting
err
o
r
in merge-options
.
txt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-12-02
Ju
n
io
C
H
am
a
no
Git 1
.
7
.
8
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-12-01
Junio C Hamano
bulk-c
h
eck
i
n: re
p
lace fas
t
-i
m
port bas
e
d impleme
n
tat
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-11-30
Junio C Hamano
csum-file: i
n
t
rod
u
ce sha1file_
c
he
c
k
point
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-11-30
Andrew Wo
n
g
r
ebase -i:
in
t
err
u
pt rebase
w
hen "com
m
i
t
--a
m
end" failed
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-11-29
Johan He
r
l
a
nd
fas
t
-import
:
F
ix
in
c
orr
e
c
t fano
u
t l
e
v
e
l
when modif
y
ing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-11-29
Jo
h
an Herland
t9301: Add 2nd testc
a
se
e
x
posing bugs in fast
-
import
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herland
t
9301
:
Fix testcase cov
e
ring up a bug
i
n
f
ast-import
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-11-28
Junio C
H
am
a
no
Git 1
.
7
.
8-r
c
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-11-28
Jonathan Nieder
Allow checkout -B <cu
r
rent-b
r
anch>
t
o update the
cur
r
ent
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-11-28
Jon
a
than N
i
ed
e
r
branch:
a
llow a no-op "branch -M <current-branc
h
>
H
EAD"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-11-28
C
a
rlos Martín
N
ieto
convert
:
track state in LF-to-CR
L
F
fi
l
ter
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-11-28
Nguyễn Thái Ngọc D
u
y
checkout,merg
e
: disallow
ov
e
rw
r
iting ig
n
ored files
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-11-28
Junio C Ha
m
a
no
Merg
e
branc
h
'nd/m
a
in
t
-igno
r
e-exclude'
i
n
t
o n
d
/
ignore
.
.
.
commit
|
commitdiff
|
tree
2011-11-28
Nguyễ
n
Thái Ngọ
c
Du
y
c
heckout,merge: loosen ove
r
writing untra
c
ked file chec
k
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-11-23
J
unio C Haman
o
Merge branch
'
maint' int
o
t
j
/
i
map-send-r
e
move
-
unused
commit
|
commitdiff
|
tree
2011-11-23
Thomas Jarosch
i
m
ap-
s
end: Remove un
u
sed '
u
se_namespace' varia
b
l
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-11-23
Vincent van Ravesteijn
built
i
n-res
e
t
: Doc
u
m
e
ntation up
d
ate
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-11-23
Vincent van Ravesteij
n
builtin
-
b
ranch: Fix crash on inv
a
l
id use of --f
o
rce
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-11-23
Jonathan Nieder
re
v
er
t
--abort: do
n
ot leav
e
behind useless sequencer
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-11-23
Johann
e
s Sixt
Fi
x
revert --a
b
ort 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
p
a
s
s non-lit
e
ral string
as forma
t
to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-11-23
Junio C Hama
n
o
Update 1
.
7
.
8 draft release notes in pre
p
aration for
rc4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-11-23
Junio C Hamano
Merge branch 'jn/
r
evert-quit
'
commit
|
commitdiff
|
tree
2011-11-23
Jonathan Nieder
revert: remove --reset
c
ompatib
i
lity o
p
tion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-11-23
Jonathan
Nieder
rever
t
:
i
ntroduce --abor
t
t
o
cancel a
failed cherry
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-11-22
Jonathan Nieder
re
v
ert:
write
R
EV
E
RT_HE
A
D p
s
e
udoref dur
i
ng conflic
t
ed
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-11-22
Jonathan Nie
d
er
revert:
improve error message for
c
herry-pick
durin
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-11-22
Jon
a
than Nieder
revert
:
rearr
a
nge
pic
k
_re
v
isions() for cl
a
rity
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-11-22
Jonathan N
i
eder
revert: rename --reset optio
n
to -
-
quit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-11-21
Junio C Haman
o
M
e
r
g
e
b
ranch 'jk/maint-1
.
6
.
2-uplo
a
d-archive'
i
nto
j
k
.
.
.
commit
|
commitdiff
|
tree
2011-11-21
Jeff King
arc
h
ive:
d
on't let r
e
mote clien
t
s get unreachable co
m
m
i
t
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-11-21
Jeff K
i
ng
upload-archi
v
e: use st
a
rt_command instead of for
k
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-11-21
Junio C
H
amano
Merge branch 'ma
i
nt
'
commit
|
commitdiff
|
tree
2011-11-21
J
u
nio
C Hamano
Merge branc
h
'rr/misc-fixes'
commit
|
commitdiff
|
tree
2011-11-21
Ram
s
ay Jones
co
n
ve
r
t
.
c: Fix return type of
git_
p
ath_check_eol()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-11-21
Vincent van Rav
e
ste
i
jn
Show error fo
r
'git merge' with unset merge
.
defaultToUps
t
re
a
m
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-11-21
Thoma
s
H
ochstein
do
c
u
mentatio
n
f
ix:
git difftool uses
d
if
f
to
o
ls, not
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-11-21
Ramsay J
o
n
e
s
config
.
c: Fix a static buffer overwrite bu
g
by avoiding
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-11-21
R
a
msa
y
Jones
t
5501-*
.
sh: Fi
x
url passe
d
to clone in setup test
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-11-18
Junio C Hamano
Hope
f
ully final update of r
e
lease notes be
f
o
re 1
.
7
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-11-18
J
u
n
io C Hamano
Mer
g
e b
r
anch 'rr/mis
c
-fixes'
commit
|
commitdiff
|
tree
2011-11-18
J
e
ff King
refresh_in
d
ex
:
make
po
r
celain output more specific
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-11-18
J
eff
K
ing
r
efresh_
i
ndex: rename format va
r
i
a
bles
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-11-18
Jeff King
read-cache: let refres
h
_cache
_
ent pass up changed fla
g
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-11-18
Jona
t
han
N
ieder
Makefile: add option
t
o disable automat
i
c depe
n
d
e
ncy
.
.
.
Improved-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-11-18
J
u
n
io C Hamano
Sync with 1
.
7
.
7
.
4
commit
|
commitdiff
|
tree
2011-11-18
Junio C Hamano
Gi
t
1
.
7
.
7
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-11-18
Junio C Hamano
M
e
r
ge br
a
nch 'jc/maint-na
m
e-rev-all' into maint
commit
|
commitdiff
|
tree
2011-11-18
Jun
i
o
C Haman
o
Merge bra
n
ch 'm
l
/m
a
ilmap'
into maint
commit
|
commitdiff
|
tree
2011-11-18
Junio C
H
amano
Merge
branc
h
'jn/maint-notes
-
avoid-va
-
args' into main
t
commit
|
commitdiff
|
tree
next