summaryrefslogtreecommitdiffstats
path: root/merge.c (unfollow)
Commit message (Expand)AuthorFilesLines
2013-07-15Git 1.8.3.3v1.8.3.3Junio C Hamano3-2/+24
2013-07-04fixup-builtins: retire an old transition helper scriptRamkumar Ramachandra2-19/+0
2013-07-04Update draft release notes to 1.8.3.3Junio C Hamano1-0/+15
2013-07-03git-config: update doc for --get with multiple valuesJohn Keeping1-1/+1
2013-07-01t7500: fix flipped actual/expectAndrew Pimlott1-3/+3
2013-07-01lib-rebase: document exec_ in FAKE_LINESAndrew Pimlott1-0/+2
2013-07-01Start preparing for 1.8.3.3Junio C Hamano2-1/+12
2013-06-30check-ignore doc: fix broken link to ls-files pageRamkumar Ramachandra1-1/+1
2013-06-30test: spell 'ls-files --delete' option correctly in test descriptionsSZEDER Gábor1-2/+2
2013-06-28Git 1.8.3.2v1.8.3.2Junio C Hamano3-2/+8
2013-06-28configure: fix option help message for --disable-pthreadsStefano Lattarini1-1/+1
2013-06-27Start preparing for 1.8.3.2Junio C Hamano2-1/+55
2013-06-21completion: complete diff --word-diffRamkumar Ramachandra1-1/+1
2013-06-21apply: carefully strdup a possibly-NULL nameThomas Rast2-1/+15
2013-06-21pull: merge into unborn by fast-forwarding from empty treeThomas Rast2-1/+37
2013-06-21pull: update unborn branch tip after indexJeff King1-2/+2
2013-06-20t7400: test of UTF-8 submodule names pass under Mac OSTorsten Bögershausen1-8/+11
2013-06-20send-email: sanitize author when writing From lineMichael S. Tsirkin2-3/+4
2013-06-20send-email: add test for duplicate utf8 nameMichael S. Tsirkin1-0/+14
2013-06-19http.c: don't rewrite the user:passwd string multiple timesBrandon Casey1-3/+9
2013-06-14handle multibyte characters in nameFredrik Gustafsson2-1/+14
2013-06-11t0070 "mktemp to unwritable directory" needs SANITYTorsten Bögershausen1-1/+1
2013-06-11pre-push.sample: Make the script executableWieland Hoffmann1-0/+0
2013-06-10Git 1.8.3.1v1.8.3.1Junio C Hamano4-2/+22
2013-06-10mingw: make mingw_signal return the correct handlerErik Faye-Lund1-1/+3
2013-06-09submodule: remove redundant check for the_index.initializedRené Scharfe1-3/+2
2013-06-09Document .git/modulesFredrik Gustafsson1-0/+3
2013-06-07gitweb: fix problem causing erroneous project listCharles McGarvey1-1/+1
2013-06-06sequencer: avoid leaking message buffer when refusing to create an empty commitFelipe Contreras1-2/+4
2013-06-05test-send-email: test for pre-sanitized self nameMichael S. Tsirkin1-0/+5
2013-06-05t/send-email: test suppress-cc=self with non-asciiMichael S. Tsirkin1-0/+5
2013-06-05t/send-email: add test with quoted senderMichael S. Tsirkin1-0/+20
2013-06-05send-email: make --suppress-cc=self sanitize inputMichael S. Tsirkin1-8/+15
2013-06-05t/send-email: test suppress-cc=self on cccmdMichael S. Tsirkin1-1/+3
2013-06-05send-email: fix suppress-cc=self on cccmdMichael S. Tsirkin1-1/+1
2013-06-04t/README: test_must_fail is for testing GitJunio C Hamano1-0/+3
2013-06-03sequencer: remove useless indentationFelipe Contreras1-7/+9
2013-06-03diffcore-pickaxe doc: document -S and -G properlyRamkumar Ramachandra2-26/+57
2013-06-03diffcore-pickaxe: make error messages more consistentRamkumar Ramachandra1-2/+2
2013-06-03git.txt: remove stale comment regarding GIT_WORK_TREEChris Rorvick1-3/+1
2013-06-03sha1_file: trivial style cleanupFelipe Contreras1-1/+1
2013-06-03read-cache: trivial style cleanupsFelipe Contreras1-2/+2
2013-06-03read-cache: fix wrong 'the_index' usageFelipe Contreras1-1/+1
2013-06-03t/send-email.sh: add test for suppress-cc=selfMichael S. Tsirkin1-0/+43
2013-06-02dir.c: fix ignore processing within not-ignored directoriesKarsten Blees2-0/+21
2013-06-02wildmatch: properly fold case everywhereAnthony Ramine2-6/+56
2013-06-02sha1_name: fix error message for @{<N>}, @{<date>}Ramkumar Ramachandra1-1/+10
2013-05-30push: make push.default = current use resolved HEADRamkumar Ramachandra1-1/+1
2013-05-30push: fail early with detached HEAD and currentRamkumar Ramachandra1-0/+5
2013-05-30Start 1.8.3.1 maintenance trackJunio C Hamano1-1/+1
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-20 06:25:15 +0100