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
C
lem
e
ns Buc
h
acher
s
implify output
o
f conflictin
g
m
erge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
Clemens
B
u
c
hacher
up
d
ate cache for
c
onf
l
icti
n
g submod
u
le entries
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
Clemens Buchacher
add tests for merging wit
h
submo
d
ul
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
G
I
T
1
.
6
.
2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-02
J
u
nio C Ham
a
no
Me
r
g
e
b
r
anch 'jc/maint-1
.
6
.
0-bl
a
m
e-s
'
in
t
o
m
aint
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
Me
r
ge branch '
j
s/maint-diff-
t
emp-smudge
'
into maint
commit
|
commitdiff
|
tree
2009-04-02
Junio C Ha
m
a
no
Merge branch 'js/m
a
in
t
-1
.
6
.
0-exec-path-env' into maint
commit
|
commitdiff
|
tree
2009-04-02
Juni
o
C Hamano
Merge br
a
nch 'bc/maint-1
.
6
.
1-branch-deleted-was' into
.
.
.
commit
|
commitdiff
|
tree
2009-04-02
Junio C H
a
mano
Me
r
ge
br
a
nch
'
tr
/
mai
n
t-1
.
6
.
1-doc
-
for
m
at-patc
h
--root
.
.
.
commit
|
commitdiff
|
tree
2009-04-02
J
u
ni
o
C Hamano
Merge branch 'dm
/
ma
i
nt-docco' into maint
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
M
erg
e
b
ranch 'ma
i
nt-1
.
6
.
1' into mai
n
t
commit
|
commitdiff
|
tree
2009-04-02
J
u
n
io C
H
a
man
o
Mer
g
e branch 'maint-1
.
6
.
0'
i
nto
maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-01
Ho
l
ger Weiß
D
o
cu
m
entation: Remove an odd "instead
"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Jef
f
K
ing
fix portability probl
e
m with IS_RUN_COM
M
AN
D
_E
R
R
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Johanne
s
Schind
e
lin
mailmap: resurrect lower-casing of email a
d
dresses
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Ju
n
io C Hamano
Upda
t
e draft
release notes to 1
.
6
.
2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Juni
o
C Hamano
Merge branch 'maint-1
.
6
.
1' into m
a
i
nt
commit
|
commitdiff
|
tree
2009-03-30
Junio C Ha
m
an
o
M
erge branc
h
'maint-1
.
6
.
0' int
o
ma
i
nt-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-03-30
Daniel Cheng (aka
.
.
.
F
i
x bash
c
omplet
i
o
n
in path with spaces
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Thomas Rast
bash c
o
mpletion: only s
h
ow 'lo
g
--me
r
g
e
' if mer
g
ing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Nico -telm
i
ch- Schot
.
.
.
git-tag(1): add hin
t
ab
o
ut commit
messages
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Allan Caffee
Docume
n
tati
o
n
:
up
d
a
te graph api example
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
J
u
nio
C
Hamano
Merge branch 'maint-1
.
6
.
1' into maint
commit
|
commitdiff
|
tree
2009-03-30
Junio
C Ham
a
no
Merge branch '
m
aint-1
.
6
.
0' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-03-30
Eric
W
o
n
g
git-sv
n
: fix ls
-
tre
e
usage with dash-pref
i
xed path
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Joha
n
n
es
S
chin
d
el
i
n
import-zips:
fix thinko
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-28
J
u
nio C Hamano
M
e
r
ge br
a
nc
h
'maint
-
1
.
6
.
1' int
o
m
a
i
n
t
commit
|
commitdiff
|
tree
2009-03-28
Emil
S
it
test-lib: Cle
a
n
up comme
n
ts and Makefile
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-27
Thoma
s
R
ast
Do
c
umentation: form
a
t-
p
atch -
-
root
clar
i
fications
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-26
C
a
rl
o
Marcelo
A
renas
.
.
.
doc
u
mentation:
update cvsimport d
e
scription
o
f "-r
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-26
David J
.
M
e
llor
Documentation: Remove s
p
uriou
s
uses of "you" in
git
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-25
J
o
hanne
s
Sixt
diff --
n
o-index: Do
not ge
n
erate
patch
o
utput
i
f other
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-24
Shawn O
.
Pearc
e
Inc
r
ease th
e
size of
the di
e
/warning
b
uffe
r
to avoid
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-24
Junio C Ham
a
n
o
Merge br
a
n
ch 'mai
n
t
-1
.
6
.
1' into maint
commit
|
commitdiff
|
tree
2009-03-24
Junio C H
a
mano
Merge branch 'ma
i
nt-1
.
6
.
0' i
n
to maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-03-24
Li
n
u
s
To
r
valds
close_s
h
a1_file(
)
: m
a
k
e
it easier to diagnose errors
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-24
Nico
l
as
Pi
t
re
avoid possible overfl
o
w i
n
delta size filter
i
n
g
computation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-23
David J
.
Mellor
D
ocumentati
o
n: minor gramm
a
ti
c
a
l
fix in
g
it
-
check-ref
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-23
David J
.
M
e
ll
o
r
Document
a
tion: mino
r
gram
m
atical fixes in git-chec
k
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-23
David
J
.
M
e
llo
r
D
o
c
u
mentation: minor g
r
ammati
c
al fixes
i
n gi
t
-cat
-
file
.
txt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-23
David J
.
Mellor
Documentation: minor grammatical f
i
xes and reword
i
ng
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-23
Dav
i
d
J
.
Mell
o
r
Documentation
:
remo
v
e so
m
e u
s
es
of the passive voice
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-22
Junio C H
a
m
ano
Merg
e
branch 'maint-1
.
6
.
1
'
into
maint
commit
|
commitdiff
|
tree
2009-03-22
J
unio C Haman
o
Me
r
ge
b
ranch 'mai
n
t-1
.
6
.
0' into
mai
n
t-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-03-22
Johannes Schindelin
Smudge the files fed to exter
n
a
l
diff and textconv
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-22
David Aguil
a
r
e
v
eryday: use the
d
ash
l
ess form of git-init
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-22
Junio
C
Hamano
Update draf
t
releas
e
notes to 1
.
6
.
2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-22
J
eff Ki
n
g
ls-files: require
worktree when -
-
deleted is gi
v
en
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-22
René Scharfe
p
i
ckaxe: count regex
m
atches only once
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-22
Junio C
H
amano
Merge branch
'
ma
i
nt-1
.
6
.
1
'
into m
a
int
commit
|
commitdiff
|
tree
2009-03-22
Jun
i
o C Hamano
M
erg
e
branch 'tr/maint-1
.
6
.
0
-
s
e
n
d
-
e
mail-irt
'
into maint
commit
|
commitdiff
|
tree
2009-03-22
Junio
C
Hamano
Merge branch 'mg/ma
i
nt-submo
d
u
le-no
r
malize-p
a
t
h
' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2009-03-22
J
unio
C
Hamano
Mer
g
e
branch
'rs/memmem' int
o
m
a
i
n
t
commit
|
commitdiff
|
tree
2009-03-22
Junio C Hamano
M
e
rge branch 'js/rsync-local
'
into maint
commit
|
commitdiff
|
tree
2009-03-22
J
u
nio C Hamano
Merge b
r
a
n
ch 'db/maint-missing-origin'
i
nto m
a
int
commit
|
commitdiff
|
tree
2009-03-22
Junio C Hamano
Merge bran
c
h 'jc/main
t
-1
.
6
.
0
-r
e
a
d-tree-overlay'
i
n
to
.
.
.
commit
|
commitdiff
|
tree
2009-03-22
Jun
i
o
C Hamano
Merge branch
'
j
s
/
m
aint-1
.
6
.
0-path-normaliz
e
' into maint
.
.
.
commit
|
commitdiff
|
tree
2009-03-22
Junio C Ha
m
ano
Merge branch 'jc/m
a
int-1
.
6
.
0-pack-directory' into
maint
.
.
.
commit
|
commitdiff
|
tree
2009-03-22
Stephen Boyd
form
a
t
-
pat
c
h: --num
b
ered-files an
d
--stdout aren't
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-22
Johann
e
s S
i
x
t
Propagate --exec-path
s
e
t
ting to exte
r
nal c
o
mm
a
nds
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-22
Brandon Casey
git-b
r
anch: display "wa
s
sha1" on branc
h
del
e
tion rather
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-20
David J
.
Mellor
Docum
e
nt
a
tion: reword exam
p
le t
e
xt
in g
i
t-bisect
.
txt
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-19
Jeff
K
i
ng
doc: clarify how -S works
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-19
David J
.
M
e
l
l
o
r
Documentatio
n
: rewo
r
ded th
e
"
Description" section of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-18
Ju
n
i
o C
H
am
a
no
blame:
rea
d
custom grafts given by -S
bef
o
re calling
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-17
David J
.
Mellor
D
o
cumen
t
ation:
m
inor
grammatical fixes in git-br
a
nc
h
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-17
Dav
i
d J
.
Mel
l
or
Documentation: minor grammatica
l
fixes in git-blame
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-17
Davi
d
J
.
Mellor
Documentation:
reword the "Description"
sect
i
on of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-17
David J
.
Mello
r
Docum
e
ntati
o
n: minor gram
m
a
t
i
c
a
l
fixes
i
n
g
i
t
-archive
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-16
Junio C H
a
mano
Rem
o
ve tota
l
confusion f
r
om git-fet
c
h and git-push
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-15
Junio C
H
amano
GIT 1
.
6
.
2
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-13
Junio C Hamano
Merge branch 'maint-1
.
6
.
1' into mai
n
t
commit
|
commitdiff
|
tree
2009-03-13
Jun
i
o
C
Hamano
Merge b
r
anch
'
maint-1
.
6
.
0' i
n
to maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-03-13
Ju
n
io C Hamano
M
e
rge branc
h
'en/ma
i
nt-
1
.
6
.
1-h
a
s
h-
o
bject'
i
nto maint
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
Juni
o
C Hamano
Merge branch
'
k
s/maint-1
.
6
.
0
-
mailinfo-folded' into
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
J
unio
C
Hamano
Merge branch 'cc/m
a
int-1
.
6
.
0
-
b
isect-fix
'
into maint
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
J
unio C
H
amano
Merge branch 'fg/ma
i
n
t
-1
.
6
.
0-e
x
c
lude-bq' into mai
n
t
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
Juni
o
C Hamano
M
e
rge bra
n
ch 'js/maint-1
.
6
.
1-filte
r
-br
a
n
ch-submodule
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
Junio C Ham
a
no
Merge bran
c
h 'g
t
/mai
n
t-1
.
6
.
1
-
utf8-width' into maint
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
Junio
C
Hamano
Merge branch 'js/maint-1
.
6
.
1-
r
emote-remove-mirror'
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
J
u
nio C Hamano
M
e
rge bra
n
ch 'ek/maint-1
.
6
.
1-f
i
lt
e
r-branch-bare' into
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
Junio C Hamano
Merge bra
n
ch 'jc/maint-1
.
6
.
1-add-u-remove
-
conflicted
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
Junio
C Hamano
Merge branch 'js/maint-1
.
6
.
1-r
e
base-i-submodu
l
e' into
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
Junio C Hamano
Mer
g
e
b
ranch 'jc/
m
ain
t
-1
.
6
.
1
-allow-uninteresting-missi
n
g
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
J
u
nio C Haman
o
Merge branch 'ks/main
t
-1
.
6
.
0-mailinf
o
-folded' into
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
Jun
i
o C Hamano
M
e
rge branch 'jk/mai
n
t-1
.
6
.
1-
c
leanup-
a
ft
e
r
-exec-failure
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
J
u
nio C Hamano
Merge
b
ranch 'jc
/
main
t
-1
.
6
.
0-
s
pli
t
-
d
iff-
m
eta
i
nfo' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-03-13
Junio C Hamano
read-tree A B C: do not create a
bogus index
a
nd do
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-12
Thoma
s
R
ast
send-em
a
il:
t
est --no-thread --i
n
-reply
-
to combination
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-11
Junio C Hamano
U
pdate draft release notes for 1
.
6
.
2
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-11
Jun
i
o C Ham
a
no
Merg
e
branch '
j
s/
m
ai
n
t-se
n
d-email'
int
o
maint
commit
|
commitdiff
|
tree
2009-03-11
Junio C Hamano
Merge
bran
c
h 'jk/sane-rel
a
ti
v
e-t
i
me' into maint
commit
|
commitdiff
|
tree
2009-03-11
Junio C Hama
n
o
M
erge br
a
nch
'
jc/mai
n
t-ad
d
-
p
-un
q
uote'
in
t
o maint
commit
|
commitdiff
|
tree
2009-03-11
Junio C Hamano
Merge branch 'fg/m
a
int-
e
x
c
lude-bq'
i
n
to maint
commit
|
commitdiff
|
tree
2009-03-11
Junio C Hamano
Merge bran
c
h 'en/ma
i
nt-hash-object
'
into maint
commit
|
commitdiff
|
tree
2009-03-11
Johannes Schinde
l
in
rs
y
nc
transport: allow local paths, and fix tests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-11
Daniel Barkal
o
w
Give error wh
e
n no
r
emote
i
s configured
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-08
J
u
nio C Hamano
Merge br
a
n
c
h
'maint-1
.
6
.
1
' into m
a
int
commit
|
commitdiff
|
tree
2009-03-07
Chris J
o
hnsen
builtin-
r
ev
e
rt
.
c: release index
loc
k
wh
e
n che
r
r
y-picking
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-07
Jeff King
document c
o
n
fig --b
o
ol-or-
i
nt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next