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
stash: invoke rerere in case of conflict
2012-08-17
Phil H
o
rd
stash: invoke re
r
ere in case
o
f
confli
c
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-08-17
Phil
H
ord
test: git-stash conf
l
ict
s
ets up rerere
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
Juni
o
C
Ham
a
n
o
Gi
t
1
.
7
.
9
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
Jun
i
o C Hamano
Sync with 1
.
7
.
8
.
6
commit
|
commitdiff
|
tree
2012-04-26
Junio C Haman
o
Gi
t
1
.
7
.
8
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hamano
Sync with 1
.
7
.
7
.
7
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hamano
Git 1
.
7
.
7
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
Jo
n
athan
N
iede
r
bund
l
e
: remove stray singl
e
-q
u
ote fro
m
error
messa
g
e
Reported-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-10
Junio C Hamano
M
e
r
ge branch 'maint-
1
.
7
.
8'
into ma
i
nt-1
.
7
.
9
commit
|
commitdiff
|
tree
2012-04-09
J
unio
C H
a
ma
n
o
Merge bra
n
ch 'jc/maint-v
e
rify-
o
b
j
ects-remove-p
e
ssimism
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Junio
C
Ha
m
ano
Merge branch '
d
w/gitwe
b
-do
c
-grammo' into maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Junio C
H
a
m
ano
Me
r
g
e branch 'tr/cache-tree' in
t
o
maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
J
unio
C
Hamano
Mer
g
e
branch 'cb/maint-t
5
541-ma
k
e-server-
p
ort-portab
l
e
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Ju
n
io C Hamano
Merge br
a
n
c
h
'
cn
/
maint-rev-
l
ist
-
doc'
i
nto maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
J
u
nio C Ham
a
n
o
Merge
branch 'tr/m
a
in
t
-
bun
d
le-boundary' into maint
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Junio C Hamano
M
er
g
e branch
'
tr/m
a
i
n
t
-bu
n
dle-lo
n
g-subject' into
ma
i
nt
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
J
u
ni
o
C
H
amano
Merge branch 'ph/rerere-doc' i
n
to mai
n
t
-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-02
Junio C
Hamano
Git 1
.
7
.
9
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-02
Junio C H
a
man
o
M
e
rge
branch
'jc/maint-merge-autoedi
t
' into
m
aint
commit
|
commitdiff
|
tree
2012-03-30
H
eiko Voigt
st
r
ing-l
i
s
t: document that string_list_
i
nser
t
(
)
inserts
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-26
Junio C Hamano
G
i
t 1
.
7
.
9
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-26
Junio
C
H
ama
n
o
Merge
b
ranc
h
'jn/maint
-
fa
s
t-import-empty-ls' i
n
to
mai
n
t
commit
|
commitdiff
|
tree
2012-03-26
Junio C Ham
a
no
M
e
rge bran
c
h 'ph/rer
e
r
e
-doc' i
n
to
maint
commit
|
commitdiff
|
tree
2012-03-26
Junio
C Hamano
Merge branch 'ms/maint-config-err
o
r-at-eol-l
i
necount
.
.
.
commit
|
commitdiff
|
tree
2012-03-26
Mark
L
odato
grep d
o
c:
ad
d
--break / --
h
eading / -W to synopsis
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-26
Rod
r
igo Silva
(Mes
t
r
.
.
.
Docu
m
enta
t
ion: improve de
s
c
riptio
n
of GIT_EDITOR and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-26
N
e
l
son Benitez
L
eon
docu
m
e
nt
a
tion: fix alp
h
a
bet
i
c
o
r
d
e
red list for git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-23
D W
a
itzman
Documentation/gi
t
web: trivi
a
l Engl
i
sh fixes
commit
|
commitdiff
|
tree
2012-03-20
Ju
n
io C Haman
o
Me
r
g
e
branch 'main
t
-1
.
7
.
8' into maint
commit
|
commitdiff
|
tree
2012-03-20
J
u
nio C Hamano
merge: bac
k
port
GIT_MER
G
E_AUTO
E
DIT suppor
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-20
J
u
n
i
o C
H
a
mano
Merge br
a
nch 'ks/s
o
rt-wildc
a
rd-in
-
m
a
kefile' into maint
.
.
.
commit
|
commitdiff
|
tree
2012-03-20
Junio C Haman
o
Merge branch 'jc/advise-i18n'
i
nto m
a
int-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-03-20
J
u
nio C
Hama
n
o
Me
r
ge
b
r
anch
'
j
n
/gitw
e
b-un
s
pecified-
a
ction' i
n
to maint
.
.
.
commit
|
commitdiff
|
tree
2012-03-15
Juni
o
C Hamano
fetch/receive
:
remov
e
ove
r
-pessimisti
c
connectiv
i
ty
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-12
Junio C Hamano
G
i
t
1
.
7
.
9
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-12
Junio C Hamano
M
erge branch 'tr/m
a
int-bundle-
b
o
u
ndar
y
'
i
nto maint
commit
|
commitdiff
|
tree
2012-03-12
Jun
i
o C
H
a
m
ano
Merge branch 'jc/maint-diff-patch-header' in
t
o m
a
in
t
By
Junio C Hamano
commit
|
commitdiff
|
tree
2012-03-12
Junio C Ha
m
ano
Merg
e
branch 'jn/main
t
-do-not-match-wi
t
h
-
u
n
s
ani
t
ize
d
.
.
.
commit
|
commitdiff
|
tree
2012-03-12
Junio C Hamano
Mer
g
e branch 'j
c
/am-3
-
nonstandard-popt
'
into
mai
n
t
commit
|
commitdiff
|
tree
2012-03-12
Martin Stenberg
co
n
fi
g
: report
e
rrors
at the EOL with
c
orrect l
i
ne
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-08
P
h
i
l
Ho
r
d
rerere: Do
c
ument 'rer
e
r
e
re
m
aining'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-06
Ja
k
ub
N
arebski
gitweb: F
i
x
fixed stri
n
g
(non-regexp) pr
o
jec
t
search
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-06
Thomas Rast
t5704:
f
ix n
o
nportable sed/grep
usa
g
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-06
Jun
i
o
C Hamano
M
erge bra
n
c
h 'maint-1
.
7
.
8' into ma
i
nt
commit
|
commitdiff
|
tree
2012-03-06
J
unio C Ham
a
no
Merge
b
ran
c
h
'maint-1
.
7
.
7' into maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-03-06
T
h
omas Rast
D
o
cu
m
ent the
--histogram
diff option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-05
Junio C Hamano
G
i
t
1
.
7
.
9
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-05
J
unio C
H
amano
Merge
b
ranch
'jc/doc-merge-options' into mai
n
t
commit
|
commitdiff
|
tree
2012-03-05
Junio C Ha
m
a
no
Merge branch 'c
n
/m
a
int
-
rev-
l
ist-doc' into
m
ain
t
commit
|
commitdiff
|
tree
2012-03-05
Th
o
m
a
s Rast
fast-
i
m
por
t
: zero
a
ll of 'struct tag' to silence v
a
lgr
i
nd
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-05
Junio
C
Hamano
Update draft releas
e
note
s
t
o
1
.
7
.
9
.
3 f
o
r the las
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-05
J
u
nio C Ham
a
no
Merge
b
ranch 'cn/maint-br
a
nch-with-bad' into maint
commit
|
commitdiff
|
tree
2012-03-05
Junio C Hamano
Merge b
r
anch 'jn/maint-gitweb-i
n
valid
-
re
g
e
x
p' into
.
.
.
commit
|
commitdiff
|
tree
2012-03-05
Juni
o
C
H
amano
M
e
rg
e
branch
'nd/main
t
-ve
r
ify-objec
t
s
'
i
nto main
t
commit
|
commitdiff
|
tree
2012-03-05
J
unio C H
a
mano
M
e
rge b
r
a
n
c
h
'jk/m
a
int-avoid-streaming-filtered-c
o
n
tents
.
.
.
commit
|
commitdiff
|
tree
2012-03-05
J
unio C Hamano
Merge b
r
anch 'jb/filter-ignore-sigpi
p
e' into maint
commit
|
commitdiff
|
tree
2012-03-05
Junio C Hamano
Me
r
ge branch 's
p
/smart-ht
t
p-fai
l
ure-to-pus
h
' into
m
ai
n
t
commit
|
commitdiff
|
tree
2012-03-05
Junio C Hamano
M
e
rge bra
n
ch 't
r
/maint-bundle-long-s
u
bject
'
into m
a
int
commit
|
commitdiff
|
tree
2012-03-05
C
lemens Buch
a
cher
http
.
proxy: also
mention
https_proxy and a
l
l_proxy
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-03
M
ichael
J
Gruber
t03
0
0: work a
r
oun
d
bug in dash 0
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-03
T
o
m
Grennan
t55
1
2 (ls-remote): moder
n
ize style
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-02
S
t
efano Lattar
i
ni
tests: fix
s
purious error when run dire
c
tly with Solar
i
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-02
Junio C Hamano
Documentation: do not assume that n > 1 in
<rev>~$n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-01
T
h
o
mas Rast
bundle: keep around name
s
passe
d
to add_
p
ending
_
object()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-01
Thom
a
s Rast
t5510: ens
u
re we stay in t
h
e
tople
v
el test
d
ir
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-01
Thomas Rast
t5510: refactor b
u
n
d
l
e->
p
ack conve
r
sion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-01
Junio C H
a
mano
diff
-
p: squelch "dif
f
--git" head
e
r
for
s
tat-dirty
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-01
Junio C Hamano
t4011: illustrate "diff-inde
x
-
p"
o
n
s
tat-dirty path
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-01
Ju
n
io C Hamano
t4011:
modernise style
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-01
Libo
r
Pechacek
D
o
cumentation fixe
s
in
g
it-conf
i
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-28
Carlos Mart
í
n Nieto
Documentation
:
u
s
e {a
s
terisk} in r
e
v-list-options
.
txt
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-28
Jakub Narebski
gitweb: Handle in
v
a
lid r
e
gex
p
in reg
e
xp sea
r
ch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-28
Nguyễn Thái Ngọc Duy
rev-
l
ist: fix --verify-objects --quiet be
c
oming --objects
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-28
Nguyễn Th
á
i
Ngọc Du
y
r
ev-list: remove
B
ISECT
_
SHOW_
T
R
I
ED flag
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Junio C
H
a
m
ano
Up
d
ate draft rel
e
ase
n
otes to
1
.
7
.
9
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Junio C Hamano
Mer
g
e bra
n
ch 'p
j
/
remote-set-branches-usa
g
e-fix' into
.
.
.
commit
|
commitdiff
|
tree
2012-02-27
J
u
ni
o
C Hamano
Mer
g
e bra
n
ch 'jn/git
w
eb-
u
nborn-
h
ead' into maint
commit
|
commitdiff
|
tree
2012-02-27
Junio C H
a
mano
Merge branch
'jn/
a
n
cient-meld-s
u
pport' into
maint
commit
|
commitdiff
|
tree
2012-02-27
Junio C Hama
n
o
Merge
branch 'tr/merge-edit
-
guidance' into
m
a
i
nt
commit
|
commitdiff
|
tree
2012-02-27
Tim Henigan
CodingGuide
l
i
n
es:
d
o
not use 'wh
i
ch' in shell
s
crip
t
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Tim He
n
igan
CodingGuidelines: Add a note
a
b
out
spa
c
es after r
e
direction
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Carlos Martín Nieto
b
r
anc
h
: don't a
s
su
m
e the m
e
rge filter ref exists
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Mi
c
h
ae
l
Haggerty
p
ost-rec
e
i
ve-ema
i
l: match up $LOGBEG
I
N
.
.
$LOGE
N
D pai
r
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
M
ichae
l
Hag
g
e
r
t
y
p
o
st-receive-email:
r
emo
v
e unused variable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Ju
n
io C Hama
n
o
test: "a
m
-3" can accept non-standard -p<num>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Junio C
Hamano
D
oc
u
ment accumul
a
ted
f
i
xes since 1
.
7
.
9
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Juni
o
C
Hamano
Merge
branch 'jc/add-refresh-unmerged' into ma
i
nt
commit
|
commitdiff
|
tree
2012-02-27
Juni
o
C
H
aman
o
Merge bra
n
ch 'js/co
n
figu
r
e-li
b
in
t
l' into maint
commit
|
commitdiff
|
tree
2012-02-27
J
u
nio C Hamano
S
y
nc with 1
.
7
.
8
.
5
commit
|
commitdiff
|
tree
2012-02-27
Jun
i
o C Hamano
G
i
t 1
.
7
.
8
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Michał Kied
r
owicz
gre
p
-P:
F
ix matching ^ an
d
$
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Jim Meyering
am: don't in
f
l
o
op f
o
r an empty input file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Andrew Wong
reb
a
se -m: onl
y
call "notes copy" when rewritten exists
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
P
ete Wyck
o
ff
git-p4: remove bash-ism in
t9800
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
P
e
te
Wyckoff
git-p4: re
m
ove
b
a
sh-i
s
m
i
n t9
8
09
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Pete Wyckoff
git-p4: fix submit regression
wi
t
h
c
lien
t
Spec an
d
subdir
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Pete Wyc
k
off
g
it-p4: set use
C
l
i
ent
S
pec v
a
riable
o
n initial clone
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-26
Dmitry V
.
Lev
i
n
Makefile
:
add thread-
u
t
ils
.
h
to LIB_H
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-24
Jef
f
King
d
o not st
r
e
am large
f
i
le
s
to pack when filters a
r
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-24
J
e
ff King
t
e
a
c
h dry-ru
n
convert_to_g
i
t not to
r
eq
u
ire a src buffer
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next