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
octopus: reenable fast-forward merges
2009-12-14
Stephen Boyd
o
c
topus:
r
e
e
na
b
le f
a
st
-
fo
r
ward merg
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-14
Stephen Bo
y
d
octop
u
s: make merge
p
rocess simpl
e
r
to follow
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Ham
a
no
Git
1
.
6
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Hamano
F
ix archiv
e
format with
-
- on the c
o
m
m
and line
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio
C Hamano
Remove post-
u
ploa
d
-hook
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-09
Juni
o
C H
a
mano
Merge bran
c
h 'mm/maint-merge-ff-
e
rror-me
s
sage-fix
'
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio
C
H
a
m
ano
Merge branch 'j
n
/m
a
in
t
-pull
-
r
e
base-error-me
s
s
age' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Merge branch 'jk/maint-add-p-delete-fix' into m
a
in
t
commit
|
commitdiff
|
tree
2009-12-08
Jeff King
a
dd-interactive: fix deletion of no
n
-empty
f
iles
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Ju
n
io C Hamano
Git 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Linus
Torv
a
lds
Fix diff -B/--dirsta
t
misco
u
nti
n
g of n
e
wly ad
d
ed contents
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Jeff Kin
g
reset: improve workt
r
ee saf
e
ty
v
alves
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Todd Zu
l
li
n
g
e
r
D
o
cumentation:
A
void use
of xmlto --str
i
ng
p
aram
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-04
Re
n
é
S
charfe
archive
:
c
l
arify des
c
ription of
p
at
h
p
a
ra
m
eter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-04
Je
f
f
King
rerere
:
don't segf
a
ult
on failur
e
to
ope
n
r
r
-cache
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
P
repare for 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Me
r
ge branc
h
'u
k
/maint-shortlog-encodi
n
g
'
into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
a
mano
M
e
rge bra
n
ch 'fc/maint-format-patch-pathspec-dashes
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Mer
g
e branch 'ap/mai
n
t-merg
e
-
s
tr
a
tegy-list-fix' i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C H
a
mano
Merge branch 'jc/m
a
i
n
t-am-
k
eep' i
n
to maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge br
a
nch
'
rs/work-around-grep-opt-
i
n
sanity'
into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
u
n
i
o C Hamano
Merge bra
n
ch 'rj/main
t
-cygwin-c
o
unt-objec
t
s' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch '
m
m/maint-hint-failed-merge' into
m
a
i
nt
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Hamano
Merge br
a
nch 't
h
/maint-
r
emote-update-help-string' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C Hamano
Merge bra
n
ch 'rj/maint-t9700' into maint
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o
C Hamano
M
erge branch 'ls/
m
a
in
t
-m
a
i
l
info-no-inbod
y
' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ha
m
ano
Merg
e
branch 'm
o
/ma
i
nt-crl
f
-doc' into maint
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C
H
am
a
no
Merge b
r
a
nch 't
h
/remote-usage'
into
m
aint
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Haman
o
Merge bran
c
h 'pb/m
a
i
nt
-
use-custom-perl' int
o
main
t
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge
b
ranch 'mm/confi
g
-path
n
ame-tild
e
-ex
p
and' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merg
e
b
r
anch 'bc/grep-i-F' into
maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hama
n
o
Mer
g
e
b
ranc
h
'j
k
/ma
i
nt-break-rename-
r
edu
c
e-m
e
m
ory'
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Hama
n
o
Merge branc
h
'rj/maint-simplify-cygwin-makefile'
into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
H
a
m
ano
Merge
b
ranch 'rg/doc-
w
or
k
flow'
i
nt
o
maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 'np/maint-sideband-favor-status' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ha
m
an
o
Documentation: xmlt
o
0
.
0
.
18 d
o
e
s
n
o
t know --stringparam
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Brandon Cas
e
y
t4201: use ISO8859-
1
r
a
ther
than
ISO-8859-1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Jan
Krü
g
er
pul
l
: clar
i
fy advice fo
r
the u
n
conf
i
gured error ca
s
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ha
m
a
no
Git 1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
U
n
conditionally se
t
man
.
base
.
ur
l
.
fo
r
.
relat
i
v
e
.
links
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C H
a
mano
D
o
c
ume
n
t
a
ti
o
n/Mak
e
fil
e
: allow
m
an
.
base
.
url
.
for
.
rel
a
ti
v
e
.
.
.
Signed-off-by:
Junio C Hamano
<junio@kernel.org>
commit
|
commitdiff
|
tree
2009-12-02
Ju
n
io C
Ham
a
no
Prepare for 1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Haman
o
merge: do not
a
d
d
sta
n
dard message when message is
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hamano
Do n
o
t misidentify "git merge f
o
o
H
EAD" as
a
n old-st
y
le
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
D
a
vid Agu
i
l
ar
help: Do
not unneces
s
arily look for a
r
e
p
osi
t
or
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Mi
c
hael J
G
rube
r
D
o
c
umentation: Fix a few i
.
e
.
/e
.
g
.
mix
-
ups
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-30
D
avid Sor
i
a Parra
Documentation:
Doc
u
m
ent --b
r
an
c
h
option in git clon
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-30
Ma
t
t
hieu
M
o
y
built
i
n-merg
e
: show user-
f
riendly
err
o
r messages for
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-30
Mat
t
hieu
Moy
m
e
rge-recursive: mak
e
the error
-
me
s
sage generation
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-30
A
ve
r
y Pennarun
bu
i
ltin-merge
.
c: call ex
c
l
u
de_c
m
ds() c
o
rrectly
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
Junio
C
Hamano
Remov
e
dead code
f
r
o
m
"git
a
m
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
Felip
e
Contreras
format-p
a
tch: add
t
e
st f
o
r parsing of "
-
-
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
Felipe Contr
e
ras
format-patch: fix parsing of "--" on the command
l
in
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
Ju
n
io C Hamano
b
uiltin-apply
.
c: pay attent
i
on
t
o -p<n> when de
t
ermining
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-25
Uwe Kleine-Kö
n
ig
shortlog: respect commit encoding
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-24
N
i
colas
P
i
t
re
pac
k
-objec
t
s: split
implications of --all-progres
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-24
Stephen
B
oyd
instaweb: restart se
r
v
e
r
i
f al
r
eady ru
n
n
i
ng
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-24
Jef
f
K
i
ng
prune-pack
e
d
:
o
nly show p
r
ogress w
h
en stderr
is a tt
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-24
J
u
nio
C Hama
n
o
Protect s
c
ripted Porce
l
ains from GREP_O
P
TI
O
NS insanity
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
René Scharfe
me
r
g
et
o
ol-
-
lib: simp
l
i
fy gu
e
ss_mer
g
e_too
l
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
M
atthie
u
M
o
y
user-ma
n
ual: Document that "g
i
t m
e
rg
e
" doesn't like
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
Matthieu Moy
mer
g
e-re
c
ursive
:
point the user
to commit when
file
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-21
Junio C Hama
n
o
Documentation: a
v
o
i
d xmlto input error
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-21
Raman Gupta
Add branch m
a
n
agement for rele
a
ses to gitworkflows
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-21
L
ukas Sandström
g
i
t am/mailinfo
:
D
on't l
o
ok
at in-body headers wh
e
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-21
T
im H
e
nigan
g
i
t
remote:
Separate
u
s
a
ge string
s
for sub
c
ommands
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-21
Junio C Hamano
diffcore-r
e
name: reduce
m
e
m
o
r
y
foo
t
p
rint b
y
freeing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-20
Ramsay
J
ones
git
-
count-objects: Fix a di
s
k-s
p
ace
u
n
der-es
t
imate
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-20
G
reg Price
Documentat
i
on: undocument gc
'
d
funct
i
on gr
a
ph_
r
elease()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-20
Ramsay Jo
n
es
t9
7
00-p
e
rl-git
.
sh
:
Fix a test f
a
il
u
re
o
n Cy
g
wi
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-19
Ma
t
thieu Moy
e
xpand_user_pat
h
: expand
~
to
$
HO
M
E, not to the actual
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-18
Matthie
u
Moy
Expand ~
a
n
d ~user in core
.
excludesfile, commit
.
templ
a
te
amended by
Junio C Hamano
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-17
Philippe Bruhat
.
.
.
Make sure $PERL
_
P
A
TH is defined when the test suit
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-17
Matthew Ogilv
i
e
core
.
a
utocrlf documentat
i
o
n
: me
n
tion
the c
r
lf att
r
ibute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-17
Brian Co
l
l
ins
g
r
ep: Al
l
ow
c
ase in
s
e
n
s
i
t
i
ve
s
earch of
f
i
xe
d
-
strings
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-16
Jeff King
diffcor
e
-
b
reak: save cnt_data for other p
h
ases
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-16
J
eff King
diffcore-break
:
free f
i
lespec d
a
ta as we
g
o
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-16
J
u
n
io C Hamano
Git 1
.
6
.
5
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-16
J
unio C Hamano
Merge
b
r
a
nch 'bs/
m
a
int-p
r
e-
c
ommit-hook-sam
p
le' into
.
.
.
commit
|
commitdiff
|
tree
2009-11-16
Juni
o
C Hamano
M
erge bran
c
h 'jk/
m
aint-add-
p
-empty
'
i
nto main
t
commit
|
commitdiff
|
tree
2009-11-16
Junio C Hamano
Merge branch 'js/
m
a
int-diff-color-words' into ma
i
n
t
commit
|
commitdiff
|
tree
2009-11-16
Junio C Ha
m
an
o
M
erge branch 'tz/maint-rpm' in
t
o maint
commit
|
commitdiff
|
tree
2009-11-16
Junio C Hama
n
o
Merge branch 'jk/
m
aint-format
-
pa
t
ch-p-
s
upp
r
ess-s
t
at
.
.
.
commit
|
commitdiff
|
tree
2009-11-16
Junio C H
a
mano
M
e
r
ge branch '
p
b/m
a
in
t
-gi
t
we
b
-
blob-l
i
neno' i
n
to ma
i
nt
commit
|
commitdiff
|
tree
2009-11-16
Junio C H
a
mano
Merge branch 'jk/maint-1
.
6
.
3-l
s
-
files-i' int
o
maint
commit
|
commitdiff
|
tree
2009-11-16
Junio C Hamano
Merge branch 'vl/maint-o
p
e
nssl-
s
ignature-change' into
.
.
.
commit
|
commitdiff
|
tree
2009-11-16
Junio C Hamano
M
erge b
r
anch 'jk/maint
-
push-config'
i
nto maint
commit
|
commitdiff
|
tree
2009-11-16
Junio
C
Hamano
Mer
g
e
branc
h
'sr/b
l
ame-i
n
complete' int
o
maint
commit
|
commitdiff
|
tree
2009-11-16
Jun
i
o
C Hamano
M
e
rge bran
c
h 'jc
/
m
a
int-blank-at-eof' into maint
commit
|
commitdiff
|
tree
2009-11-16
Jun
i
o C H
a
mano
Merge branch 'jc/maint-
1
.
6
.
3-graft
-
trailing-space'
.
.
.
commit
|
commitdiff
|
tree
2009-11-16
Juni
o
C Hamano
Merge br
a
n
ch 'tr/maint-roff-qu
o
te' in
t
o maint
commit
|
commitdiff
|
tree
2009-11-16
J
u
ni
o
C Hamano
M
e
rge bran
c
h 'ja/fetch-do
c
' into maint
commit
|
commitdiff
|
tree
2009-11-16
Junio C
Hama
n
o
Merg
e
branch 'cb/doc-fe
t
ch-pul
l
-me
r
ge' into maint
commit
|
commitdiff
|
tree
2009-11-16
J
u
nio C Hamano
M
e
r
ge
branch 'jk
/
m
a
int-
c
vsim
p
ort-pathname' int
o
maint
commit
|
commitdiff
|
tree
2009-11-16
Junio
C
Haman
o
Merge branch '
j
c/re
c
eive-
p
ac
k
-auto' i
n
to maint
commit
|
commitdiff
|
tree
2009-11-16
Junio C Hamano
Merge
b
r
anch 'gb/maint-gitwe
b
-esc
-
para
m
' i
n
to maint
commit
|
commitdiff
|
tree
2009-11-16
Junio C Hamano
M
e
r
g
e branch
'j
n
/gitweb-patc
h
' into maint
commit
|
commitdiff
|
tree
2009-11-15
Tim Henigan
Update 'git remote update'
usage s
t
ring to match man
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-14
Todd Zu
l
linger
Makefile
:
En
s
ure rpm packages can b
e
read by ol
d
er
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-14
Step
h
en Boyd
git-a
d
d
.
txt:
f
ix formatting of --patch
s
ection
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next