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
refuse to merge during a merge
2009-06-02
Clemens Buchacher
refuse t
o
me
r
ge
d
uring a merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-28
Cle
m
ens
B
uc
h
a
che
r
fix segfault sh
o
w
i
ng
an
empty r
e
mote
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-26
J
u
nio C Hamano
P
repare for 1
.
6
.
3
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-26
Junio C Hama
n
o
Merge br
a
nch 'js/maint-no-ln-acr
o
ss-libexec-a
n
d
-
b
in
.
.
.
commit
|
commitdiff
|
tree
2009-05-26
J
u
nio C Hamano
Merge branch 'lt/maint-diff-r
e
d
u
ce-lstat'
i
nto ma
i
nt
commit
|
commitdiff
|
tree
2009-05-26
Junio C
H
amano
Merge
branch
'jm/forma
t
-patch-no-auto-n
-
when-k-is-given
.
.
.
commit
|
commitdiff
|
tree
2009-05-26
Junio C Hamano
M
erg
e
branch 'do/maint-merge-recurs
i
ve-f
i
x' into maint
commit
|
commitdiff
|
tree
2009-05-26
Jun
i
o C
H
ama
n
o
Merge branc
h
'jk/
m
aint-1
.
6
.
0
-
trace-a
r
gv' into m
a
int
commit
|
commitdiff
|
tree
2009-05-26
J
unio C Hamano
Merge bran
c
h
'
np/
p
u
sh-delta
'
into maint
commit
|
commitdiff
|
tree
2009-05-26
Ju
n
i
o
C
Ham
a
no
Merge
bran
c
h 'ar/merg
e
-
o
n
e
-
file-di
a
g' into maint
commit
|
commitdiff
|
tree
2009-05-26
Jun
i
o
C
H
a
mano
Me
r
g
e
br
a
nch 'ar/unlink-err' into mai
n
t
commit
|
commitdiff
|
tree
2009-05-26
Ju
n
io C H
a
mano
Merge branch 'jk
/
maint-ad
d
-empty' into maint
commit
|
commitdiff
|
tree
2009-05-25
Jef
f
King
fix
c
at-
f
ile usage messa
g
e and docu
m
e
n
t
a
tion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-25
Jeff K
i
n
g
fetc
h
: report re
f
storage DF errors
m
or
e
ac
c
uratel
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-25
Jeff King
lock_
r
ef: inform callers of unavailab
l
e ref
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-25
Michael J Gruber
merge-options
.
t
xt:
Clarify merge --squash
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-24
Junio C Hamano
Merge br
a
nch 'main
t
-
1
.
6
.
2' into
maint
commit
|
commitdiff
|
tree
2009-05-24
Junio C Hamano
Mer
g
e br
a
nch '
m
aint-1
.
6
.
1
' into mai
n
t-
1
.
6
.
2
commit
|
commitdiff
|
tree
2009-05-24
Junio
C
H
amano
Merge bran
c
h 'maint
-
1
.
6
.
0' i
n
to mai
n
t-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-05-24
Alex Rie
s
en
htt
p
-
push
.
c
::
r
e
move_locks
(
): fix use after free
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-21
R
e
né Schar
f
e
g
r
ep:
f
ix w
o
rd-regex
p
c
o
louring
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-21
G
i
useppe Bilotta
completion: use git
rev
-
p
arse t
o
de
t
ect bare repos
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-21
J
o
h
a
n
nes Schindeli
n
Cope better with a _lot_ of p
a
cks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-20
Jeff Kin
g
for
-
each-ref: fi
x
segfau
l
t
i
n cop
y
_email
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-17
S
t
ephe
n
Boyd
show-b
r
anch: Fix d
i
e
m
es
s
age in p
a
rse_re
f
log_param()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-17
Stephen Boyd
completion: add missing
options to show-branc
h
a
n
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-17
Linus Torvalds
d
ir
.
c:
c
l
e
an u
p
h
andlin
g
o
f
'path' paramete
r
in
r
ead_dir
e
cto
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-17
Dan Mc
G
ee
Fix
type-punning issues
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-17
Nan
a
ko S
h
iraishi
test: checkout shouldn't
say that HEAD has moved if
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-17
J
u
nio C Hamano
c
o
m
p
letion:
e
nhance "current branch" d
i
sp
l
ay
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-17
J
unio C Hamano
completion: simpli
f
y "cu
r
rent branch" in __git_ps1()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-17
J
unio C Hamano
completion: f
i
x PS1 disp
l
ay
duri
n
g a merge on detach
e
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-16
Daniel
C
order
o
b
u
iltin-check
o
ut: Don't
t
ell use
r
that HEAD has moved
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-16
Jim
M
e
ye
r
i
n
g
pre-commit
.
s
a
mpl
e
: don't print inci
d
ental SHA1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-16
S
t
ephe
n
Boyd
tests: Add tests for m
i
ssing format-pat
c
h lo
n
g
options
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-16
S
t
ephen B
o
yd
api-parse
-
o
p
tions
.
tx
t
:
u
s
e 'func' instead of 'func
t
'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-16
Tony
K
emp
Turn
o
n USE_
S
T_TIMESPEC
f
or Ope
n
BSD
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-16
Jun
i
o
C H
a
ma
n
o
Merge branch 'ma
i
nt-1
.
6
.
2' into maint
commit
|
commitdiff
|
tree
2009-05-14
Junio C Hamano
Merge br
a
n
c
h 'maint-1
.
6
.
1' int
o
maint-
1
.
6
.
2
commit
|
commitdiff
|
tree
2009-05-14
Junio C Hamano
Merge br
a
nch
'maint-1
.
6
.
0' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-05-14
Johannes Schi
n
delin
Add NO_
C
ROSS
_
DIRECTORY
_
H
A
RDLINKS
support to t
h
e Makefile
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-13
Junio C
H
a
ma
n
o
GIT 1
.
6
.
3
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-12
J
unio C Ha
m
ano
M
e
rge branch '
m
aint-1
.
6
.
2' i
n
to maint
commit
|
commitdiff
|
tree
2009-05-12
Jun
i
o C Hama
n
o
Merg
e
b
r
anch '
j
c/
m
aint-rea
d
-t
r
e
e
-mul
t
i'
into
m
aint
.
.
.
commit
|
commitdiff
|
tree
2009-05-12
Junio C
H
am
a
n
o
Revert "checkout
b
ranc
h
:
p
rime ca
c
he-tree fully"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-10
Alex Riesen
l
s
-t
r
ee manp
a
ge: output
o
f
ls-
t
r
e
e is c
o
mpatible with
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-10
Alex Riesen
ls-tree ma
n
p
a
ge: use
"unless" instead of
"
when
.
.
.
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-10
D
ave Olszewski
m
e
rge-r
e
cursive:
never leave i
n
d
ex
u
nmerged while
r
ecursing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-10
Linus Torvalds
Teach 'git
checko
u
t
'
to
p
r
eload the index conte
n
ts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-10
L
inus To
r
valds
Avoid
unnecessary '
l
stat(
)
'
calls
in 'get_
s
tat_data()'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-09
Jeff
K
ing
add: don't compla
i
n
wh
e
n adding empty project ro
o
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-09
Jim Meye
r
in
g
format-patch let
-
k
o
verride a
c
o
nf
i
g-
s
pecifi
e
d format
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-09
Jeff
King
f
ix GIT_TRACE s
e
gfault with shell-quoted aliases
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-09
Alexander Pota
s
he
v
Documen
t
at
i
on: cloning t
o
empty di
r
ectory is
allowed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-09
Alex Riesen
Cl
a
rify kin
d
of conflict in merge-
o
ne-fil
e
helper
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-09
Felipe
C
ontreras
g
it config: clarify --add
a
nd --get-color
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-09
Junio C Ha
m
a
n
o
archive-tar
.
c: squelch a type m
i
smat
c
h warni
n
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-09
J
unio C
H
am
a
no
Sta
r
t
1
.
6
.
3
.
1
m
aintenanc
e
se
r
ie
s
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-09
Junio C Hama
n
o
Merge branch 'mai
n
t-1
.
6
.
1' into maint-1
.
6
.
2
commit
|
commitdiff
|
tree
2009-05-09
Junio C Hamano
Merge branc
h
'maint-1
.
6
.
0' into
maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-05-07
Ju
n
io C Hamano
GIT 1
.
6
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-07
Nguyễn T
h
á
i
Ng
ọ
c D
u
y
t4
0
29: use s
h
instead of bash
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-06
Brandon C
a
sey
t4200
:
convert sed expression which operates on non
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-06
Brandon
Case
y
t4200: remove tw
o
unne
c
e
s
sary lines
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-06
Brandon
C
as
e
y
t/annota
t
e-tests
.
sh: avoid passi
n
g a
non-
n
ewline termi
n
a
t
ed
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-06
Brand
o
n Casey
t4118: avo
i
d sed
inv
o
cation on fil
e
w
i
thout termi
n
a
t
ing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-06
Brandon
C
asey
t411
8
: add m
i
ssing '&
&
'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-06
Brandon Case
y
t8005: use eg
r
ep when exten
d
ed regul
a
r
expressions
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-06
Ju
n
io C Hamano
gi
t
-clean doc: the
c
ommand only affects
paths und
e
r
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-06
Jun
i
o
C Hama
n
o
Mer
g
e bran
c
h 'maint'
commit
|
commitdiff
|
tree
2009-05-06
Juni
o
C Hamano
Merge branch 'rj/maint-
1
.
6
.
0
-
svn-parse
-
f
ix' into maint
commit
|
commitdiff
|
tree
2009-05-06
J
u
nio C Hamano
Merge br
a
nch 'm
a
int-1
.
6
.
0
'
into maint
commit
|
commitdiff
|
tree
2009-05-06
Alex R
i
esen
impro
v
e error message in config
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-06
B
ra
n
don Casey
t401
8
-diff-funcname: add cp
p
xfuncname pattern to s
y
nta
x
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-06
Bernd
A
h
l
e
rs
Work around BSD w
h
ose typeof(tv
.
tv_sec) != time_t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-06
St
e
phen Boyd
git-am
.
t
x
t: reword
e
x
tra headers i
n
message bo
d
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-06
Ste
p
hen Bo
y
d
git-am
.
txt: Use da
t
e
o
r
val
u
e instead of time or timesta
m
p
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-06
Stephen Bo
y
d
git-am
.
txt: add an 'a
'
, say wh
a
t 'it' is, simplify
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-06
Stephen
Boyd
completion: com
p
lete
v
alues for
se
n
d-email
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-06
Ste
p
hen Boyd
compl
e
t
i
on:
complete values for log
.
date
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-06
Stephen Boyd
compl
e
tion:
c
omplete va
l
ues for
h
elp
.
format
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-06
Stephen Bo
y
d
compl
e
tion: ad
d
{gui,diff,merge}to
o
l, man, and pager
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-06
St
e
phen Boyd
co
m
pl
e
tion: add miss
i
ng conf
i
guration var
i
ables to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-06
Allan C
a
ffee
dir
.
c
: Fix tw
o
minor
grammatical errors
i
n
comm
e
nts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-06
Ro
b
in H
.
John
s
on
g
i
t-sv
n
: fix a sl
o
ppy Getopt::Lo
n
g
us
a
ge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-03
J
u
nio C
Hama
n
o
S
y
nc
w
ith GIT
1
.
6
.
2
.
5
commit
|
commitdiff
|
tree
2009-05-03
Juni
o
C Ha
m
an
o
GIT 1
.
6
.
2
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-03
J
u
nio C Ha
m
ano
Merge branch 'np/maint-no-ofs-del
t
a'
i
n
to maint
commit
|
commitdiff
|
tree
2009-05-03
Junio C H
a
mano
Merge bra
n
ch 'maint-
1
.
6
.
1' into
mai
n
t
commit
|
commitdiff
|
tree
2009-05-03
Ju
n
io C
Hamano
GIT 1
.
6
.
1
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-03
Junio C Hama
n
o
Merg
e
branch 'j
c
/maint-re
a
d-tree-multi' i
n
to maint
commit
|
commitdiff
|
tree
2009-05-03
Junio C Haman
o
M
erge branch
'
m
k
/mai
n
t-ap
p
ly-sw
a
p' into maint
commit
|
commitdiff
|
tree
2009-05-03
Junio
C
Hamano
Merge branch 'mm/maint-add-p-quit'
into maint
commit
|
commitdiff
|
tree
2009-05-03
Ju
n
io
C
Hamano
M
e
r
g
e branch 'lt/pac
k
-object-memuse' int
o
m
a
int
commit
|
commitdiff
|
tree
2009-05-03
Junio
C
Hamano
Merge branch 'jc/m
a
int-1
.
6
.
0
-keep-pa
c
k'
i
nto maint
.
.
.
commit
|
commitdiff
|
tree
2009-05-03
Junio C Hamano
Merge branc
h
'jc/maint-1
.
6
.
0-di
f
f-borrow-carefully
.
.
.
commit
|
commitdiff
|
tree
2009-05-03
Junio C Haman
o
M
erge b
r
an
c
h
'
bs/ma
i
nt-1
.
6
.
0-tree-walk-prefix
'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2009-05-02
Junio C H
a
mano
GIT
1
.
6
.
3-rc4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-02
N
i
colas P
i
tre
honor re
p
ack
.
usedeltabaseoffse
t
when fetchin
g
packs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-02
J
u
nio C
Hamano
Mer
g
e git://repo
.
o
r
.
c
z
/
git-gui
commit
|
commitdiff
|
tree
next