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
merge script: refuse to merge during merge
2010-08-18
J
onathan Nieder
merg
e
scrip
t
:
refuse to me
r
g
e
during merge
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonat
h
an Nieder
merge sc
r
ipt: tweak
u
nm
e
r
g
e
d files
message to match
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
Nieder
m
erge script: --squash, --ff from unborn branc
h
are
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonath
a
n N
i
e
d
er
fmt-
m
e
rge
-
msg -m t
o
override mer
g
e
t
i
t
le
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nied
e
r
merge
-
base --in
d
e
p
endent to print
r
educe
d
parent list
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
J
onathan
N
iede
r
m
erg
e
-base --octopus to mimic show-bra
n
ch --merge-base
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
Documentation: add
a
SEE ALS
O
sect
i
o
n
for merge-base
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t6
2
00 (fmt-merge-
m
s
g
): style nit
p
ic
k
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Niede
r
t6010 (merg
e
-b
a
se
)
:
m
odernize st
y
le
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t7600 (
m
erge): te
s
t merge
f
rom
branch ye
t
to be bor
n
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nied
e
r
t7600
(merge
)
: che
c
k reflo
g
entry
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonatha
n
Nieder
t
7
6
00 (merge):
d
o n
o
t launch gitk for
-
-debug
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
J
o
nath
a
n
Nieder
t7600 (merge): modernize style
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jon
a
than Nieder
m
e
rge: do not mis
t
ake (ance
s
t
or of) tag for branch
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-21
Jonathan Nie
d
er
t/README: correct an ex
c
eptio
n
wh
e
n breaking a && chain
.
.
.
commit
|
commitdiff
|
tree
2010-07-16
Jonatha
n
Nieder
A
d
d a
s
a
m
ple us
e
r for the
svnd
u
mp l
i
brary
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-15
Jon
a
than Nieder
Documentation: add submodule
.
*
to the big configuration
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-15
Jonathan Niede
r
gitmodules
.
5: url
c
a
n be a relat
i
ve path
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-14
Jonathan N
i
eder
g
i
t --p
a
ginate
:
pa
g
inat
e
externa
l
c
o
mmands again
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-12
J
o
nath
a
n Nie
d
er
t3000 (
l
s-file
s
-
o
)
: modernize st
y
le
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-08
Jonathan Nie
d
er
t9118 (git-svn): p
r
event early failure
from taking
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-07
Jonathan Ni
e
der
t/REA
D
ME
:
do
c
ument more te
s
t
h
elpers
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-29
Jonathan
Nieder
r
e
v
e
r
t: do not
r
e
b
uild argv on heap
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-28
Jon
a
than Nieder
te
s
ts: local config file should be honored f
r
om
subdirs
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-28
Jonathan Nieder
t70
0
6
:
test pag
e
r configuration for several
g
it comman
d
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-28
Jon
a
t
han Nieder
t7006 (p
a
ge
r
): introduce helper for
p
a
r
a
meter
i
zed
tests
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-14
Jonathan Nieder
t35
0
8
(che
r
r
y
-pi
c
k)
:
futurepro
o
f against u
n
me
r
ge
d
files
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-14
Jonathan Nieder
git-svn: strip off leading sl
a
shes on --trunk argumen
t
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-13
Jonathan
Nieder
add-interact
i
ve: Clarify “
r
e
m
aining
hunks
in
t
he file”
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-13
J
ona
t
ha
n
Nieder
grep: refactor grep_objec
t
s
loop into its own f
u
nction
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-11
Jonathan Nieder
Documentation/ch
e
ckout: clarify description
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-11
Jona
t
han Nieder
rebase -i -p: do
c
ument s
h
ortcomings
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-02
Jonathan
Nieder
DWI
M
'git show
-
5
' t
o
'
g
it show --do-walk -5'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-01
Jona
t
ha
n
Nied
e
r
git
i
gn
o
re
.
5: Cla
r
ify matching rules
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-01
Jon
a
than
N
ieder
rebase: improv
e
e
r
ror message
when u
p
st
r
e
am
a
r
gument
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-01
J
o
nathan Nieder
Documentation/che
c
kout: cla
r
ify descr
i
ption
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-28
Jonath
a
n Nied
e
r
f
s
c
k
:
fix bogus commit header check
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-20
Jonathan
N
i
eder
Add git re
m
ote se
t
-bra
n
ches
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-20
J
o
nathan Ni
e
der
post-recei
v
e-email: document command-line mode
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nieder
git svn: avoi
d
unini
t
iali
z
ed var in
'reset'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jona
t
h
an Nieder
Makef
i
le: let he
a
der dependency check
e
r
o
verride COMPUTE_HEA
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jo
n
athan Nieder
Makefile: fix header dependency
checker to al
l
ow NO_C
U
RL
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Ni
e
der
D
o
c
umentat
i
o
n/not
e
s:
n
itpicks
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jo
n
ath
a
n Nieder
Documentati
o
n/n
o
tes: clean u
p
de
s
criptio
n
of rewri
t
ing
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonat
h
an Nieder
Docume
n
tation/not
e
s: simplify treatme
n
t of default
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan
N
ieder
D
ocumentat
i
on/log: add a CONFIGURATION
section
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
J
o
n
a
than Nieder
Doc
u
mentati
o
n/not
e
s:
s
implify tre
a
tment of
default
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nieder
Documentation/note
s
: add co
n
figuratio
n
sec
t
i
on
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Ni
e
d
e
r
D
o
cumentation/notes: describ
e
content of notes b
l
obs
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nieder
D
ocu
m
entation
/
notes: doc
u
ment format
of no
t
es trees
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-08
J
ona
t
han
N
ieder
cherry-pick: d
o
not dump core whe
n
iconv fails
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-08
Jona
t
han Nieder
pr
e
tt
y
: i
n
itialize
new cmt_
f
mt_map to 0
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-08
J
onathan N
i
eder
adapt request-
p
ull tes
t
s for new pull request fo
r
mat
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-06
Jonathan Nie
d
e
r
test-lib
:
some shells d
o
no
t
let $? propagate in
t
o
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan Nieder
s
h
or
t
log: D
o
cument and test --format option
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan Nieder
t4201 (shortlog): Te
s
t output format with multi
p
l
e
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan Nieder
t
4
201 (shor
t
lo
g
): guar
d
setup wi
t
h test_e
x
pect_suc
c
es
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jon
a
than Nie
d
er
Documenta
t
ion/sh
o
rtlog: scripted users should n
o
t
r
ely
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
J
onatha
n
Nieder
c
o
m
m
i
t
-
-ame
n
d: cope
w
ith missing displa
y
name
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan N
i
eder
test-lib: L
e
t
tests specify
c
ommands t
o
be run at
end
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-01
Jonathan Nieder
fsck: check i
d
e
nt lines
in
commit objects
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-01
Jonathan Nieder
request-pull: protect against OPTIONS_KEEP
D
ASHDASH
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-01
Jo
n
a
t
han Nieder
tests for request-pull
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-22
Jonathan Ni
e
der
Docum
e
ntatio
n
/Makefile: fix inte
r
rupted builds of u
s
er
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-20
J
onathan Ni
e
der
fix
"
b
undle --stdin" segfault
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-20
Jo
n
athan Nieder
t5704 (bu
n
d
l
e
): add tests
for bu
n
dle --stdi
n
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-17
Jonath
a
n Nieder
tag -
v
: use RUN_GIT_CMD
t
o run verify-tag
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-15
J
onathan Nie
d
er
Do
c
ument new "al
r
eady-merged" ru
l
e for branch -d
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-15
Jonatha
n
N
i
e
d
e
r
Add
.
depend dir
e
ctor
i
es to
.
giti
g
nore
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-15
Jon
a
tha
n
N
ie
d
er
t70
0
6: guar
d
cleanup with test_expect_su
c
c
e
ss
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-13
Jonatha
n
Nieder
t5800:
testgit help
e
r require
s
Python support
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-11
Jonathan Niede
r
t74
0
0: clarify submodule up
d
ate
t
ests
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-11
J
o
nathan Nieder
t7400: clarify 'submod
u
le add' tes
t
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-11
Jona
t
han
Nieder
t7400: split setup into
m
u
l
t
iple tests
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-04
J
o
n
ath
a
n Nie
d
er
Teach
m
a
ilinfo
%
< as an alter
n
ative scissors
m
ark
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-03
Jo
n
athan Nieder
Makef
i
le: future-proo
f
Cy
g
win version check
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonatha
n
Ni
e
d
e
r
merge-rec
u
rsive: a
d
d a label for ancestor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
J
onat
h
an Nieder
cherry
-
pick, reve
r
t:
a
dd a label for ancestor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonat
h
an Nieder
revert: cla
r
ify label on conflict hunks
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nie
d
e
r
c
o
m
pat: add
m
empcpy()
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jon
a
than N
i
eder
checkout -m --co
n
f
l
ict=
d
i
ff3: add a
l
abel for ancestor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
Nied
e
r
merge_trees():
ad
d
ancestor label parameter for diff3
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
me
r
ge_file(): add comment exp
l
a
i
nin
g
behavi
o
r
wrt conflict
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@mgila.com>
commit
|
commitdiff
|
tree
2010-03-21
J
onathan
Niede
r
checkout -
-
conflict=diff3
:
add a label for anc
e
s
tor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
ll_merge(): add ancestor label parame
t
er for diff3
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonat
h
an Nieder
m
erge-file --
d
iff3:
add
a lab
e
l
f
or anc
e
st
o
r
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
xd
l
_merge(): move file1 and file2 labels to x
m
par
a
m
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Ni
e
der
xdl_merge(): add optional ancesto
r
label to diff3-style
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
tests
:
d
o
c
u
m
ent c
h
erry-pick beha
v
io
r
in face
o
f conflicts
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
test
s
: docum
e
nt format
o
f con
f
l
icts from checkout -m
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jona
t
h
an Nie
d
e
r
revert: fix ti
n
y me
m
ory leak in cherry-pick --ff
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-20
Jonathan Nieder
Makefile
:
Fix
occas
i
onal GIT-CF
L
AGS breakage
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-20
Jon
a
than Nied
e
r
M
a
k
efile: Fix CD
P
ATH
p
r
oble
m
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-20
J
o
na
t
han Ni
e
de
r
gitk: Don't
c
lobber "Remember
t
h
is view
"
s
e
tting
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-20
Jonathan Nieder
gitk:
A
dd comments to explain encod
e
_vi
e
w_opts
a
nd
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-28
Jonathan N
i
e
der
Makefile:
cla
r
if
y
defini
t
ion of TEST_OBJS
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-23
Jonathan Nieder
am: re
m
ove r
e
bas
e
-apply directo
r
y
b
efore
g
c
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-22
Jonathan Nieder
t
ests: Fix
r
ace co
n
dition in t7
0
06-p
a
ger
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-21
Jona
t
han Nieder
t7006-pa
g
er: if
s
tdout is no
t
a
t
erminal, mak
e
a new on
e
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-20
Jonath
a
n
Nied
e
r
test
s
: Ad
d
tests for automatic
use
o
f
pager
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
next