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
simplify output of conflicting merge
2009-04-05
Clemens Buchach
e
r
simplify ou
t
pu
t
o
f
c
o
n
f
l
ict
i
ng
m
erge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Cle
m
e
n
s
Buchacher
update cache for co
n
flicting submodule entries
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Clem
e
ns Buc
h
ache
r
add test
s
for
m
erging wit
h
s
ubmo
d
ules
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-02
Junio
C
Ha
m
ano
GIT 1
.
6
.
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-02
J
u
nio C Hamano
Merge bra
n
ch 'jc/maint-1
.
6
.
0-blame-
s
' into main
t
commit
|
commitdiff
|
tree
2009-04-02
Junio
C Hamano
M
e
rge
branch 'js/maint-di
f
f-te
m
p-smudge' into maint
commit
|
commitdiff
|
tree
2009-04-02
Ju
n
io C Hamano
M
erge branch
'j
s
/
m
ain
t
-1
.
6
.
0
-
exec-path-env' into
mai
n
t
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
M
e
rge bran
c
h
'
bc/maint-1
.
6
.
1-branc
h
-
d
el
e
ted-was'
i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-04-02
Ju
n
io C Hamano
Merge b
r
a
n
ch 'tr/
m
aint
-
1
.
6
.
1-doc-form
a
t-patch--root
.
.
.
commit
|
commitdiff
|
tree
2009-04-02
Jun
i
o C Hamano
M
erge bran
c
h 'dm/maint-do
c
co' into maint
commit
|
commitdiff
|
tree
2009-04-02
Juni
o
C Hamano
Merge branch 'maint-1
.
6
.
1' into maint
commit
|
commitdiff
|
tree
2009-04-02
Junio
C
Hamano
M
e
rg
e
branch
'maint-1
.
6
.
0
'
into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-01
H
olger W
e
iß
Documen
t
atio
n
: Remove an odd
"
ins
t
ead
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Jeff King
f
i
x porta
b
ility prob
l
em wi
t
h IS_RUN_COMMAND_ERR
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
J
o
han
n
es
Schindelin
mailmap: re
s
u
rrect
l
ower-casing o
f
email addres
s
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
J
u
nio C
H
amano
Update
d
raft release notes to
1
.
6
.
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
J
unio
C Hamano
Mer
g
e bra
n
ch 'maint-1
.
6
.
1' into maint
commit
|
commitdiff
|
tree
2009-03-30
Junio C Hamano
Merge bran
c
h '
m
aint-
1
.
6
.
0'
i
nto m
a
int-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-03-30
Dani
e
l Ch
e
ng (aka
.
.
.
Fix ba
s
h completion
in path with space
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Th
o
mas Rast
bash completion: only s
h
ow 'log
-
-merge' if me
r
gin
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Nico -telmich- Scho
t
.
.
.
g
i
t-tag(1)
:
add hi
n
t about
comm
i
t me
s
sages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Allan C
a
f
fee
Docume
n
tation:
update
gr
a
ph
api example
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Jun
i
o
C Hamano
Merg
e
br
a
n
c
h 'ma
i
nt-1
.
6
.
1
' into maint
commit
|
commitdiff
|
tree
2009-03-30
Junio C Haman
o
Me
r
ge branch 'm
a
i
nt-1
.
6
.
0' into ma
i
nt-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-03-30
Eric Wong
g
i
t
-
svn: fix ls-tree
usage with
d
ash-prefixed
p
aths
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Jo
h
a
n
nes
S
ch
i
n
de
l
in
i
mport-zips
:
fi
x
think
o
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-28
J
unio
C
Hamano
Merge
branch
'maint-1
.
6
.
1'
i
nto maint
commit
|
commitdiff
|
tree
2009-03-28
Emil Sit
test-l
i
b: Clean up comments and Ma
k
e
f
i
le
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-27
Thomas Rast
Documen
t
ation: format-patch --root cl
a
r
ifications
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-26
Carlo Marcelo Arenas
.
.
.
docum
e
ntatio
n
:
up
d
ate cv
s
import description
of
"
-r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-26
D
avi
d
J
.
Mellor
D
ocumentatio
n
: Remove spurious uses
o
f "you" in git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-25
J
o
hannes Sixt
diff --no-inde
x
: Do
n
ot
gene
r
ate patch o
u
tpu
t
if other
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-24
Shawn O
.
P
earce
I
n
crease the size of the die/warning buffer
t
o avo
i
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-24
Juni
o
C Hamano
Merge branc
h
'maint-1
.
6
.
1' into maint
commit
|
commitdiff
|
tree
2009-03-24
Junio
C
Hamano
Merge branch
'
m
a
int-1
.
6
.
0' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-03-24
Linus Torvalds
close_sha1_file(): make i
t
easi
e
r to diagnose er
r
ors
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-24
Nic
o
las
Pitr
e
a
v
oid possible o
v
er
f
low
in
delta s
i
ze filterin
g
compu
t
ation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-23
David J
.
Mell
o
r
Docum
e
nt
a
tion
:
minor grammatical fix
i
n gi
t
-check-ref
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-23
David J
.
Me
l
lor
Documentation: m
i
nor grammatical fixes in git-chec
k
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-23
David
J
.
Mellor
Do
c
umentation: minor gra
m
m
atic
a
l fixes in gi
t
-cat-f
i
le
.
txt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-23
David J
.
Mellor
Documentati
o
n: minor grammatical
fixes and rewo
r
ding
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-23
Da
v
id J
.
M
e
llor
Doc
u
menta
t
ion
:
remove some uses
of the passive voice
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-22
Ju
n
i
o
C Hamano
Merge branch 'maint-1
.
6
.
1' into maint
commit
|
commitdiff
|
tree
2009-03-22
Junio C Hamano
Merge
b
r
a
nch '
m
a
in
t
-1
.
6
.
0'
i
nto maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-03-22
Jo
h
annes Schindelin
Smudge the files f
e
d to ex
t
ern
a
l di
f
f
a
n
d tex
t
conv
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-22
David A
g
ui
l
ar
ev
e
ryday
:
use the d
a
s
hless
form of git-in
i
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-22
J
unio C Hamano
U
p
date
dra
f
t rel
e
ase n
o
te
s
to 1
.
6
.
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-22
Jeff King
l
s-files: re
q
uire worktree wh
e
n --delete
d
i
s given
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-22
René Scharfe
pick
a
xe: count regex ma
t
c
h
es onl
y
once
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-22
Ju
n
i
o
C Hamano
M
e
rg
e
b
ra
n
ch 'maint-1
.
6
.
1
' into ma
i
nt
commit
|
commitdiff
|
tree
2009-03-22
Ju
n
io C
Haman
o
Merge b
r
anch 'tr/m
a
int
-
1
.
6
.
0-
s
end-email-
i
rt' into m
a
int
commit
|
commitdiff
|
tree
2009-03-22
Junio C Hamano
Merge
b
ranch
'
mg/maint-subm
o
dule-n
o
rmalize-pa
t
h' into
.
.
.
commit
|
commitdiff
|
tree
2009-03-22
Junio C Hamano
Merg
e
br
a
nch 'rs
/
memme
m
'
into
m
aint
commit
|
commitdiff
|
tree
2009-03-22
Junio C Hamano
Merge
b
ranch 'js/
r
s
y
nc-loc
a
l' i
n
t
o maint
commit
|
commitdiff
|
tree
2009-03-22
Junio C Hama
n
o
Merge branch 'db/m
a
int-
m
issing-origin' into maint
commit
|
commitdiff
|
tree
2009-03-22
Junio C Hamano
Merge branch 'jc/maint-1
.
6
.
0-read-
t
re
e
-overlay' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2009-03-22
J
unio C Haman
o
Merge
branch 'js
/
maint-1
.
6
.
0-path-normalize'
i
n
to mai
n
t
.
.
.
commit
|
commitdiff
|
tree
2009-03-22
Junio C Hamano
Merg
e
branch 'jc/ma
i
n
t-1
.
6
.
0
-
pack-directo
r
y' into
maint
.
.
.
commit
|
commitdiff
|
tree
2009-03-22
Stephen Boyd
f
o
rmat-patch: --numbered-files an
d
-
-
stdout aren't
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-22
Johannes Sixt
Propagate -
-
exec-path setting to external commands
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-22
Br
a
ndon Ca
s
e
y
gi
t
-branch: dis
p
lay "was sha1" on
b
ranch d
e
letion rat
h
e
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-20
David J
.
M
e
l
lor
Documen
t
ation: reword
e
x
ample text in
g
i
t
-b
i
sect
.
txt
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-19
Je
f
f K
i
ng
doc:
c
l
arify how -S works
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-19
David
J
.
Mellor
D
o
cumentation
:
r
e
worded the "Description" s
e
ction of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-18
Ju
n
io C Hamano
bl
a
me:
r
ead custom grafts
given by -S before call
i
ng
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-17
David
J
.
M
ellor
D
o
cum
e
ntation: m
i
nor gram
m
atical fixes in git
-
branch
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-17
David J
.
M
ellor
Documentation:
minor gra
m
matical f
i
xes in git-blame
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-17
David J
.
Mellor
Documentation: reword the "Descripti
o
n"
s
e
ctio
n
o
f
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-17
David
J
.
Mellor
Docu
m
entation: m
i
nor grammati
c
al fix
e
s in git-archive
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-16
Ju
n
io C Hamano
Rem
o
ve t
o
tal confusion from git-f
e
tch and git-p
u
sh
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-15
Ju
n
io
C
H
amano
G
IT 1
.
6
.
2
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-13
Junio C Hamano
Mer
g
e
b
ranch
'
m
a
i
nt-1
.
6
.
1'
i
nto mai
n
t
commit
|
commitdiff
|
tree
2009-03-13
Jun
i
o C Hama
n
o
Merge branch 'ma
i
nt-1
.
6
.
0' i
n
t
o main
t
-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-03-13
Junio C H
a
man
o
Merge branch 'en/maint-1
.
6
.
1-hash-object' int
o
m
a
in
t
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
Junio
C
Hamano
Mer
g
e branch
'
ks/maint
-
1
.
6
.
0-ma
i
linfo-folded' into
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
Junio C Ha
m
ano
Merge branch 'cc/
m
aint
-
1
.
6
.
0-bisect-fi
x
' into
ma
i
nt
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
Junio C Ha
m
ano
Merge bra
n
ch 'fg/maint-1
.
6
.
0-ex
c
l
ude-bq' into maint
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
Jun
i
o C Hamano
Mer
g
e bran
c
h
'
js/main
t
-1
.
6
.
1-filt
e
r
-
branch-submodul
e
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
Jun
i
o C Ham
a
no
M
e
rge b
r
anch 'gt/maint
-
1
.
6
.
1
-
utf8-width' into maint
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
J
u
n
io C H
a
mano
Merge bra
n
ch 'js/m
a
i
n
t-1
.
6
.
1
-
r
e
mote-remove-m
i
r
ror'
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
Juni
o
C
H
a
mano
Merge branch 'ek/maint
-
1
.
6
.
1-f
i
lter-bra
n
ch-bare' into
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
Junio C Haman
o
M
erge branch 'jc
/
maint-
1
.
6
.
1-add-u-remove-
c
o
n
f
lict
e
d
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
Junio C Hamano
M
e
r
ge branc
h
'
j
s
/
main
t
-1
.
6
.
1-reba
s
e-i-s
u
bmodule' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
Junio C Haman
o
Merge br
a
nch 'j
c
/maint-1
.
6
.
1-allow
-
uninteresting-missing
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
Ju
n
io C
Hamano
M
e
rg
e
branch 'ks/mai
n
t-1
.
6
.
0
-
m
ailinfo-
f
olded' into
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
Jun
i
o C Hamano
Merge branch 'jk/maint
-
1
.
6
.
1-cleanup
-
after-exec-failur
e
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
J
u
nio C Hamano
Merge branch 'jc/maint-1
.
6
.
0-split-
d
iff-
m
etainfo'
into
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
Junio C
Hamano
read-tree A
B C: do not
cre
a
te a bogu
s
i
n
d
e
x and d
o
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-12
Thomas Rast
send-email: test --no-thread --in-reply
-
to combin
a
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-11
Junio C Hama
n
o
Update draft release notes for 1
.
6
.
2
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-11
Junio C
H
amano
Merge br
a
nch 'js
/
mai
n
t-s
e
nd
-
email'
i
n
t
o mai
n
t
commit
|
commitdiff
|
tree
2009-03-11
J
u
n
io C Hamano
Me
r
ge
b
r
an
c
h 'jk/sane-rela
t
ive-t
i
me'
into
m
a
i
nt
commit
|
commitdiff
|
tree
2009-03-11
Junio C H
a
mano
M
e
rge branc
h
'jc/maint-ad
d
-p-unqu
o
te
'
i
n
to maint
commit
|
commitdiff
|
tree
2009-03-11
J
u
nio
C
H
a
mano
Me
r
ge branc
h
'
f
g/maint-exclude-bq'
i
nto maint
commit
|
commitdiff
|
tree
2009-03-11
Junio C
H
amano
Merge branch 'en/maint-h
a
s
h-object' into main
t
commit
|
commitdiff
|
tree
2009-03-11
Johanne
s
Sch
i
ndelin
rsync tra
n
spo
r
t
: all
o
w local
p
aths, and
fix tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-11
Danie
l
Barkalow
Give error wh
e
n
no remot
e
is configured
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-08
Junio
C Hamano
Merge b
r
a
n
c
h
'mai
n
t-1
.
6
.
1'
i
nto maint
commit
|
commitdiff
|
tree
2009-03-07
Chris Johnsen
builtin-
r
evert
.
c
:
release ind
e
x
l
ock when cherr
y
-picking
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-07
Jeff King
document confi
g
--
b
o
o
l-
o
r-
i
n
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next